aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into pr...Andreas Fischer2015-04-282-5/+10
| | |\ \ \ \
| | | * | | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-5/+7
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | [ticket/security-180] Add tests for redirecting to main URLMarc Alexander2015-04-231-0/+2
| | | | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-112-4/+4
| | | * | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-0/+9
| | | |\ \ \ \ | | |/ / / / / | | | | _ / / | | | | / /
| | | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-112-1/+4
| | | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-284-6/+6
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-284-2/+65
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-284-2/+65
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-284-2/+65
| | |\ \ \ | | | |/ /
| | | * | [3.0.x] Add changelog for 3.0.14 release.Andreas Fischer2015-04-281-0/+26
| | | * | [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-274-7/+19
| | | * | [3.0.x] Bumping version numbers to final for 3.0.14 releases.Andreas Fischer2015-04-2710-12/+12
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3557 from VSEphpbb/ticket/13778Andreas Fischer2015-04-271-1/+1
| |\ \ \ \
| | * | | | [ticket/13778] Update wording of the reCaptcha instructionsMatt Friedman2015-04-261-1/+1
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3555 from akoeplinger/ticket/12101Andreas Fischer2015-04-271-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| |/ / / /
* | | | | Merge pull request #3524 from marc1706/ticket/8672Tristan Darricau2015-04-2724-57/+220
|\ \ \ \ \
| * | | | | [ticket/8672] Update hash of lock fileMarc Alexander2015-04-241-1/+1
| * | | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-242-3/+3
| * | | | | [ticket/8672] Remove unnecessary lines from clean-vendor-dirMarc Alexander2015-04-241-9/+0
| * | | | | [ticket/8672] Update fastImageSize to 1.0.2Marc Alexander2015-04-241-5/+5
| * | | | | [ticket/8672] Add fastImageSize to clean-vendor-dir in build.xmlMarc Alexander2015-04-241-0/+9
| * | | | | [ticket/8672] Update fastImageSize to 1.0.1Marc Alexander2015-04-241-5/+5
| * | | | | [ticket/8672] Remove outdated imagesize classMarc Alexander2015-04-241-549/+0
| * | | | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-2410-18/+18
| * | | | | [ticket/8672] Add fast-image-size library to composer.jsonMarc Alexander2015-04-242-0/+52
| * | | | | [ticket/8672] Updated the text_formatter.s9e serviceJoshyPHP2015-04-242-9/+9
| * | | | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-2420-46/+706