aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13807] Add version to the usage outputJoas Schilling2015-05-051-1/+1
* [ticket/13807] Only output the header for diffJoas Schilling2015-05-021-6/+7
* [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
* [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
* [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-023-14/+68
* [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
* [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-022-6/+106
* 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \
* | \ \ \ \ Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-250-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #3549 from bantu/ticket/13765Andreas Fischer2015-04-252-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | |/ /
* | | | Merge pull request #3546 from brunoais/ticket/13772Andreas Fischer2015-04-221-1/+1
|\ \ \ \
| * | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
|/ / / /
* | | | Merge pull request #3537 from RMcGirr83/ticket/13763Andreas Fischer2015-04-161-1/+1
|\ \ \ \
| * | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
|/ / / /
* | | | Merge pull request #3533 from Elsensee/ticket/13756Dhruv Goel2015-04-142-2/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/13756] Add test for generate_resize_string()Oliver Schramm2015-04-121-0/+53
| * | | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
|/ / /
* | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-103-3/+3