aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [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-251-3/+15
* [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
* [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-251-3/+11
* [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] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
* [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-246-15/+36
|\
| * [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| * Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
| |\
| * \ Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-131-1/+1
| |\ \ | | |/
| * | Merge branch 'develop' into ticket/10820-developDhruv2013-06-131-1/+1
| |\ \
| | * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-111-1/+1
| | |\ \ | | | |/
| | | * Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| | | |\
| | | | * [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| * | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1358-487/+3429
| |\ \ \ \ | | |/ / /
| | * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-081-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-051-7/+8
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-05-121-1/+9
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-dev...Andreas Fischer2013-04-271-6/+18
| |\ \ \ \ \ | | |/ / / /
* | | | | | [feature/twig] Only set extensions if extension manager is loadedNathan Guse2013-06-241-1/+4
* | | | | | [feature/twig] Fixing file header copyrightsNathan Guse2013-06-245-105/+35
* | | | | | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-242-5/+6
* | | | | | [feature/twig] Fix <!-- .blah since the being node was changedNathan Guse2013-06-242-2/+7
* | | | | | [feature/twig] Able to set chain of namespaces to search for loadTemplate()Nathan Guse2013-06-244-3/+147
* | | | | | [feature/twig] Use twig->display rather than echo twig->renderNathan Guse2013-06-241-1/+1
* | | | | | [feature/twig] Event template tagNathan Guse2013-06-244-40/+97
* | | | | | [feature/twig] Changing method for begin node to not use anonymous functionNathan Guse2013-06-233-3/+89
* | | | | | [feature/twig] Setup the style chain/loader properlyNathaniel Guse2013-06-181-18/+26
* | | | | | [feature/twig] Fix begin loops & subloopsNathaniel Guse2013-06-152-43/+52
* | | | | | [feature/twig] Throw exceptions (don't catch and ignore)Nathaniel Guse2013-06-141-1/+1
* | | | | | [feature/twig] Add && and || supportNathaniel Guse2013-06-141-0/+3
* | | | | | [feature/twig] Use twig loader filesystem with namespaces to add pathsNathaniel Guse2013-06-143-11/+65
* | | | | | [feature/twig] Use phpbb_template_twig in testsNathan Guse2013-06-122-4/+4
* | | | | | [feature/twig] Use phpBB's resource locator to find templatesNathan Guse2013-06-122-1/+51
* | | | | | [feature/twig] Some additional operators, more stuff for IFNathan Guse2013-06-125-5/+54
* | | | | | [feature/twig] Correcting output of INCLUDEJSNathan Guse2013-06-122-57/+27
* | | | | | [feature/twig] Fixing IF .blah correctlyNathan Guse2013-06-112-8/+28