aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/twig] INCLUDEJS now uses the definition classNathaniel Guse2013-07-024-4/+23
* [feature/twig] Update phpbb_template interfaceNathaniel Guse2013-07-012-23/+47
* [feature/twig] Should have been elseNathaniel Guse2013-07-011-1/+1
* [feature/twig] Fix call for previous change to var name caseNathaniel Guse2013-07-011-1/+1
* [feature/twig] CommentsNathaniel Guse2013-07-011-8/+7
* [feature/twig] Use correct case for variable nameNathaniel Guse2013-07-011-3/+3
* [feature/twig] Fixed tabs in environment.phpNathaniel Guse2013-07-011-40/+41
* [feature/twig] Clean up the messenger a little bitNathaniel Guse2013-07-011-41/+60
* [feature/twig] Don't forget to set the context when rendering!Nathaniel Guse2013-07-011-1/+1
* [feature/twig] Remove get_lang function (it's not used anywhere)Nathaniel Guse2013-07-011-21/+1
* [feature/twig] Do not assign var by referenceNathaniel Guse2013-07-011-3/+2
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-012-17/+46
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-07-011-4/+34
| |\
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympusAndreas Fischer2013-07-011-4/+34
| | |\
| | | * [ticket/10838] Fix URL for wiki and remove irrelevant lineDhruv2013-07-021-2/+2
| | | * [ticket/10838] Remove php 5.4 and builtin server referencesDhruv2013-07-021-7/+1
| | | * [ticket/10838] Fix missing dataDhruv2013-07-021-2/+2
| | | * [ticket/10838] separate database used mentioned in unit testsDhruv2013-07-021-8/+8
| | | * [ticket/10838] Updated RUNNING_TESTS.mdDhruv2013-06-271-0/+36
| * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into developAndreas Fischer2013-07-011-13/+12
| |\ \ \
| | * | | [ticket/11585] Make $auth_admin class propertyDhruv2013-07-021-13/+12
* | | | | [feature/twig] Fix length replace in lexerNathaniel Guse2013-07-011-1/+1
* | | | | [feature/twig] Prevent errors from empty user->styleNathaniel Guse2013-07-011-1/+1
* | | | | [feature/twig] Use adm_relative_path to build admin namespaceNathaniel Guse2013-07-012-6/+12
* | | | | [feature/twig] Remove classes related to old template engineNathaniel Guse2013-07-015-2062/+0
* | | | | [feature/twig] Remove debug code, set debug/auto reload correctlyNathaniel Guse2013-07-011-6/+2
* | | | | [feature/twig] Remove resource locator dependency from templateNathaniel Guse2013-07-0110-12/+8
* | | | | [feature/twig] Fix template/context.phpNathaniel Guse2013-07-011-2/+2
* | | | | [feature/twig] Fix template/template_php_test.phpNathaniel Guse2013-07-011-1/+10
* | | | | [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
| | |\ \ \ | | | |/ / | | |/| |