aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* [feature/twig] INCLUDEPHP token abs paths & fix testNathaniel Guse2013-06-252-12/+15
* [feature/twig] INCLUDEPHP token, replace variable usage with $contextNathaniel Guse2013-06-251-3/+6
* [feature/twig] INCLUDEPHP token supportNathaniel Guse2013-06-253-0/+114
* [feature/twig] Add a comment to tpl output if PHP used, but disabledNathaniel Guse2013-06-251-4/+8
* [feature/twig] Pass parameters required to twig env via constructorNathaniel Guse2013-06-252-43/+36
* [feature/twig] PHP token supportNathaniel Guse2013-06-254-0/+89
* [feature/twig] Remove duplicate test callsNathaniel Guse2013-06-241-15/+2
* [feature/twig] Delete template_spacing_test.phpNathaniel Guse2013-06-241-87/+0
* [feature/twig] Delete template_locate_test.phpNathaniel Guse2013-06-241-68/+0
* [feature/twig] Correct template_inheritance_test.phpNathaniel Guse2013-06-241-10/+1
* [feature/twig] Correct includejs testNathaniel Guse2013-06-242-14/+13
* [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
* [feature/twig] Delete template_compile_test.phpNathaniel Guse2013-06-241-31/+0
* [feature/twig] Delete renderer_eval_test.phpNathaniel Guse2013-06-241-31/+0
* [feature/twig] Delete invalid constructs template testNathaniel Guse2013-06-243-89/+0
* [feature/twig] Working on fixing testsNathan Guse2013-06-245-63/+72
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-2437-306/+1406
|\
| * Merge branch 'develop-olympus' into developJoas Schilling2013-06-211-16/+15
| |\
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
| | |\
| | | * [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | * Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticke...Dhruv2013-06-201-15/+15
| | | |\
| | | | * [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | * [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into developJoas Schilling2013-06-212-6/+6
| |\ \ \ \
| | * | | | [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| * | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-06-201-10/+43
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympusJoas Schilling2013-06-201-10/+43
| | |\ \ \ \
| | | * | | | [ticket/11604] Skip installer step where config.php is created.Andreas Fischer2013-06-191-20/+27