aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13638] Add testsNicofuma2015-05-041-0/+49
* [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
* [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
* Merge branch '3.1.x'Nicofuma2015-05-041-1/+1
|\
| * Merge pull request #3564 from VSEphpbb/ticket/13516Nicofuma2015-05-041-1/+1
| |\
| | * [ticket/13516] Update image search scriptMatt Friedman2015-05-041-1/+1
| | * [ticket/13516] Do not search ICC profiles in extension vendorsMatt Friedman2015-04-281-1/+1
* | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \
| * | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
* | | | Merge pull request #3589 from marc1706/ticket/13782Tristan Darricau2015-05-0416-25/+25
|\ \ \ \
| * | | | [ticket/13782] Rename null driver test to dummy driver testMarc Alexander2015-05-041-1/+1
| * | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-043-4/+4
| * | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-0413-20/+20
* | | | | Merge branch '3.1.x'Tristan Darricau2015-05-041-0/+7
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge pull request #3562 from VSEphpbb/ticket/11521Tristan Darricau2015-05-041-0/+7
| |\ \ \
| | * | | [ticket/11521] Add missing lang strings for migration exceptionsMatt Friedman2015-04-281-0/+7
| | | |/ | | |/|
* | | | Merge branch '3.1.x'Nicofuma2015-05-033-24/+29
|\ \ \ \ | |/ / /
| * | | Merge pull request #3588 from nickvergessen/ticket/13809-ascNicofuma2015-05-033-24/+29
| |\ \ \
| | * | | [ticket/13809] Test each file individuallyJoas Schilling2015-05-031-21/+28
| | * | | [ticket/13809] Perform the lint test prior to normal testsJoas Schilling2015-05-032-3/+1
| |/ / /
* | | | Merge branch '3.1.x'Joas Schilling2015-05-033-2/+38
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-033-2/+38
| |\ \ \
| | * | | [prep-release-3.1.4] Add security issue to changelogJoas Schilling2015-05-031-0/+4
| | * | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | * | | [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-033-4/+4
* | | | | Merge branch '3.1.x'Andreas Fischer2015-05-033-1/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-030-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-05-032-1/+5
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-033-1/+42
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-033-1/+42
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.Andreas Fischer2015-05-031-0/+4
| | | * | | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-034-6/+12
* | | | | | | Merge pull request #3535 from MateBartus/ticket/13762Tristan Darricau2015-05-0269-686/+1679
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-022-7/+7
| * | | | | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
| * | | | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-0267-679/+1663
|/ / / / / / /
* | | | | | | Merge pull request #3565 from MateBartus/ticket/13793Tristan Darricau2015-05-0214-70/+44
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-0114-70/+44
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-05-021-9/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch '3.0.x' into 3.1.xTristan Darricau2015-05-021-9/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #3575 from marc1706/ticket/13792Tristan Darricau2015-05-021-9/+1
| | |\ \ \ \ \
| | | * | | | | [ticket/13792] Use hhvm instead of manually installing nightlys for nowMarc Alexander2015-05-011-9/+1
| | |/ / / / /
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-294-4/+36
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-282-5/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-04-282-3/+14
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r...Andreas Fischer2015-04-282-3/+14
| | | |\ \ \ \
| * | | \ \ \ \ Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-282-5/+10
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |