aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | [feature/twig] Fix includephp_from_subdir_test.phpNathaniel Guse2013-07-012-5/+7
* | | | | [feature/twig] Remove the twig loader class that I started (don't use it)Nathaniel Guse2013-07-011-51/+0
* | | | | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-0110-14/+15
* | | | | [feature/twig] Fix includephp nodeNathaniel Guse2013-07-011-8/+6
* | | | | [feature/twig] PHP test moved to a separate fileNathaniel Guse2013-07-011-0/+21
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0119-134/+174
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-2917-131/+169
| |\ \ \ \
| | * | | | [ticket/9341] Assert that page doesnt contain next or prev page postsDhruv2013-06-281-1/+3
| | * | | | [ticket/9341] Follow the Next/Prev link in testsDhruv2013-06-281-5/+9
| | * | | | [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | * | | | [ticket/9341] Add tests for checking Next and Previous template varsDhruv2013-06-271-0/+33
| | * | | | [ticket/9341] Move create_topic and post into functional test caseDhruv2013-06-272-101/+101
| | * | | | [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-2213-27/+27
| | * | | | [ticket/9341] Correctly named template varssakimahesh2013-06-221-2/+2
| | |/ / /
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into developAndreas Fischer2013-06-291-0/+1
| |\ \ \ \
| | * | | | [ticket/11593] initialize $is_expr as null before being passed to get_varrefDhruv2013-06-291-0/+1
| | |/ / /
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-271-4/+15
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympusAndreas Fischer2013-06-271-4/+15
| | |\ \ \
| | | * | | [ticket/11618] Replace glob() with scandir() and string matchingJoseph Warner2013-06-261-4/+15
| | | | |/ | | | |/|
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-270-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into devel...Andreas Fischer2013-06-271-3/+4
| | |\ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-271-3/+4
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into devel...Andreas Fischer2013-06-271-3/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | [ticket/11615] Fix typo in creation_testAndy Chase2013-06-261-1/+1
| | | * | | [ticket/11615] Remove magic number in creation_testAndy Chase2013-06-261-1/+2
| | | * | | [ticket/11615] Rename class in file to matchAndy Chase2013-06-261-1/+1
| | | * | | [ticket/11615] Rename init_test to creation_test for clarityAndy Chase2013-06-261-0/+0
* | | | | | [feature/twig] Fix template_test.phpNathaniel Guse2013-07-017-88/+38
* | | | | | [feature/twig] A bit of cleanup in twig.phpNathaniel Guse2013-07-011-11/+14
* | | | | | [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_blockNathaniel Guse2013-07-011-0/+22
* | | | | | [feature/twig] Add addslashes filter (to use on LA_ instead of escape)Nathaniel Guse2013-07-012-2/+3
* | | | | | [feature/twig] Remove the get_rootref and get_tpldata functions prev addedNathaniel Guse2013-07-012-24/+3
* | | | | | [feature/twig] Transform {L_, {LA_ to use the lang() functionNathaniel Guse2013-07-013-16/+47
* | | | | | [feature/twig] Fixing include nodeNathaniel Guse2013-07-011-17/+19
* | | | | | [feature/twig] Fixing define nodeNathaniel Guse2013-07-011-3/+3
* | | | | | [feature/twig] Fixing div by replacementNathaniel Guse2013-07-011-3/+3
* | | | | | [feature/twig] Adding ! operatorNathaniel Guse2013-07-011-5/+7
* | | | | | [feature/twig] Add S_NUM_ROWS to loops in contextNathaniel Guse2013-06-291-0/+5
* | | | | | [feature/twig] Adding some operators to the extensionNathaniel Guse2013-06-291-3/+7
* | | | | | [feature/twig] Fixing more stuff for DEFINE/INCLUDENathaniel Guse2013-06-292-9/+44
* | | | | | [feature/twig] Fixing DEFINE statementsNathaniel Guse2013-06-295-33/+196
* | | | | | [feature/twig] New Twig filter, subsetNathaniel Guse2013-06-282-5/+46
* | | | | | [feature/twig] Replace BEGIN with Twig for using LexerNathaniel Guse2013-06-265-213/+83
* | | | | | [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)Nathaniel Guse2013-06-261-4/+4
* | | | | | [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNTNathaniel Guse2013-06-261-0/+3
* | | | | | [feature/twig] Forgot to set up $config in node/php.phpNathaniel Guse2013-06-251-0/+2
* | | | | | [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-252-4/+16
* | | | | | [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
* | | | | | [feature/twig] Fixing template events test (and behavior)Nathaniel Guse2013-06-251-11/+7
* | | | | | [feature/twig] Don't require phpbb_config, some tests pass nullNathaniel Guse2013-06-251-1/+1