aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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 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 '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.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 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 '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.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.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 '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 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 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 #3532 from prototech/ticket/13755Marc Alexander2015-04-262-0/+4
|\ \ \ \
| * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-102-0/+4
* | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-250-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |