aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | [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
| | | * | | | | [ticket/11604] Fix case where config.php is not generated by phpBB.Andreas Fischer2013-06-181-1/+23
| | | * | | | | [ticket/11604] Use variables for config.php filesnames.Andreas Fischer2013-06-181-6/+10
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-201-2/+2
| | |\ \ \ \ \
| | | * | | | | [ticket/11603] Fix out dated commentJoas Schilling2013-06-201-1/+1
| | | * | | | | [ticket/11603] Fix usage noteJoas Schilling2013-06-201-1/+1
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-202-28/+83
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-202-28/+83
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | [ticket/11603] Throw RuntimeExceptions instead of using exit()Joas Schilling2013-06-192-2/+2
| | | * | | | | [ticket/11603] Avoid using cURLJoas Schilling2013-06-192-19/+19
| | | * | | | | [ticket/11603] Split api_request into two functions (query only vs. full url)Joas Schilling2013-06-131-10/+8
| | | * | | | | [ticket/11603] Fix spacing and add some commentsJoas Schilling2013-06-131-2/+5
| | | * | | | | [ticket/11603] Fix github API callsJoas Schilling2013-06-132-14/+57
| | | * | | | | [ticket/11603] Rename network to forks and fix handlingJoas Schilling2013-06-131-14/+14
| | | * | | | | [ticket/11603] Fix github api url and use curl with valid user agentJoas Schilling2013-06-132-2/+13
| | | |/ / / /
| * | | | | | 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 remote-tracking branch 'nickvergessen/ticket/11561' into developDhruv2013-06-181-0/+8
| |\ \ \ \ \
| | * | | | | [ticket/11561] Specify used tables in notification fixture, so they are emptiedJoas Schilling2013-06-181-0/+8
| * | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-06-130-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820' into develop-...Joas Schilling2013-06-131-9/+30
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |