aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-032-0/+36
|\ \
| * | [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-032-2/+2
* | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-032-0/+41
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-032-0/+41
| |\ \
| | * | [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-033-3/+9
| | * | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r...Andreas Fischer2015-04-281-1/+7
| | |\ \
* | | \ \ 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-293-2/+34
* | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | [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-281-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| * | | | [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-281-0/+6
| |\ \ \ \ | | |/ / /
| | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
* | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-283-1/+64
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-283-1/+64
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [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-273-6/+18
| | * | | [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
| | |_|_|/ | |/| | |
* | | | | [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-261-0/+2
|\ \ \ \
| * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-101-0/+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 #3359 from marc1706/ticket/13568Nicofuma2015-03-292-5/+10
| | |\ \
* | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
* | | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
* | | | | [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-102-2/+2
|/ / /
* | | [prep-release-3.1.4] Add changelog for 3.1.4-RC1Joas Schilling2015-04-091-1/+116
* | | [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
* | | Update version to 3.1.4-RC1Joas Schilling2015-04-095-7/+7
* | | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
|\ \ \
| * | | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-111-0/+6
* | | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-063-1/+30
|\ \ \ \
| * | | | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-193-1/+30
* | | | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-062-0/+16
|\ \ \ \ \
| * | | | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-132-0/+16
* | | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-063-1/+12
|\ \ \ \ \ \
| * | | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+1