aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-011-0/+1
* [feature/twig] Fix includephp nodeNathaniel Guse2013-07-011-8/+6
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-012-3/+3
|\
| * Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-291-3/+2
| |\
| | * [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | * [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
| | |/
* | | [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-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
| |\ \ \ \ \ | | |/ / / /