aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
* | | [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-249-32/+56
|\ \ \ | |/ /
| * | 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 developAndreas Fischer2013-06-201-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympusAndreas Fischer2013-06-201-0/+4
| | |\ \ \
| | | * | | [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| | | |/ /
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
| |\ \ \ \ | | |/ / /
| | * | | [ticket/10820] fix if condition to check for IEDhruv2013-06-141-1/+1
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-132-2/+2
| |\ \ \ \ | | |/ / /
| | * | | [ticket/10820] Add additional check for IE in conditionDhruv2013-06-131-2/+2
| | * | | [ticket/10820] Fix function docblockDhruv2013-06-121-1/+1
| | * | | [ticket/10820] Inject IE version in functionDhruv2013-06-121-8/+9
| | * | | [ticket/10820] fix regexDhruv2013-06-121-1/+9
| | * | | [ticket/10820] remove unnecessary parenthesesDhruv2013-06-121-1/+1
| | * | | [ticket/10820] fix docblockDhruv2013-06-121-1/+1
| | * | | [ticket/10820] add param and return to functionDhruv2013-06-121-3/+6
| | * | | [ticket/10820] simplify regex and escape dotDhruv2013-06-121-1/+1
| | * | | [ticket/10820] Use singular returnDhruv2013-06-121-1/+1
| | * | | [ticket/10820] remove unnecessary condition checksDhruv2013-06-121-2/+2
| | * | | [ticket/10820] add function docblockDhruv2013-06-121-0/+4
| | * | | [ticket/10820] fix IE check functionDhruv2013-06-121-8/+8
| | * | | [ticket/10820] proper usage of global and local variable browserDhruv2013-06-121-2/+2