aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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 '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 remote-tracking branch 'phpbb-security/ticket/security-180' into prep-r...Andreas Fischer2015-04-282-3/+14
| |\
* | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-294-4/+36
* | | 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 '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 #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
| |/
* | [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-096-8/+8
* | Merge pull request #3525 from marc1706/ticket/13749Oliver Schramm2015-04-061-1/+1
|\ \
| * | [ticket/13749] Add missing slash to base uri in helper route testsMarc Alexander2015-04-061-1/+1
|/ /
* | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-063-1/+55
|\ \
| * | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-113-1/+55
* | | 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
| * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+2
| * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-033-0/+10
* | | | | | Merge pull request #3523 from Nicofuma/ticket/13747Joas Schilling2015-04-061-0/+9
|\ \ \ \ \ \
| * | | | | | [ticket/13747] Add assertions to test_validate_path_linuxTristan Darricau2015-04-061-0/+9
|/ / / / / /
* | | | | | Merge pull request #3458 from nickvergessen/ticket/8494Tristan Darricau2015-04-061-6/+4
|\ \ \ \ \ \
| * | | | | | [ticket/8494] Ignore errors from the database schema preparationJoas Schilling2015-03-011-6/+4
* | | | | | | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| * | | | | | | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
* | | | | | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| * | | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25