aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
|\ | | | | | | * 3.0.x:
| * Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-04-282-3/+14
| |\ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * Merge remote-tracking branch 'phpbb-security/ticket/security-180' into ↵Andreas Fischer2015-04-282-3/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.14 * phpbb-security/ticket/security-180: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
* | | \ Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-282-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * \ \ \ Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into ↵Andreas Fischer2015-04-282-5/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.4 * phpbb-security/ticket/security-180-asc: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * | | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-5/+7
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | | * | | [ticket/security-180] Add tests for redirecting to main URLMarc Alexander2015-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-0/+9
| | |\ \ \ \ | |/ / / / / | | | _ / / | | | / / | | | | | Conflicts: tests/security/redirect_test.php
| | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-112-1/+4
| | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | SECURITY-180
* | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [3.0.x] Increment version number to 3.0.15-dev. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | | [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
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-284-2/+65
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| | * | [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 instructions * VSEphpbb/ticket/13778: [ticket/13778] Update wording of the reCaptcha instructions
| * | | | [ticket/13778] Update wording of the reCaptcha instructionsMatt Friedman2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13778
* | | | | Merge pull request #3555 from akoeplinger/ticket/12101Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver * akoeplinger/ticket/12101: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| * | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was added as a workaround for bugs in very old versions of IIS, dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868. Newer IIS versions handle the 'Location' header just fine, so we can avoid the unnecessary HTML page for redirects. Given that it seems to work fine since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special check for earlier versions as they are no longer supported by MS as well. PHPBB3-12101
* | | | Merge pull request #3532 from prototech/ticket/13755Marc Alexander2015-04-262-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13755] Ignore dots in path when determining file extension.
| * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-102-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13755
* | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-250-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | * prep-release-3.1.4:
| * | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* | \ \ \ \ Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-250-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | * 3.0.x:
| * | | | | Merge pull request #3549 from bantu/ticket/13765Andreas Fischer2015-04-252-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* | | | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. Conflicts: phpBB/includes/functions.php phpBB/includes/startup.php
| | * | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13765
* | | | Merge pull request #3546 from brunoais/ticket/13772Andreas Fischer2015-04-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() * brunoais/ticket/13772: [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
| * | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13772
* | | | Merge pull request #3537 from RMcGirr83/ticket/13763Andreas Fischer2015-04-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13763] Fix typo in extension lang file * RMcGirr83/ticket/13763: [ticket/13763] Fix typo in extension lang file
| * | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13763
* | | | Merge pull request #3533 from Elsensee/ticket/13756Dhruv Goel2015-04-142-2/+55
|\ \ \ \ | |_|_|/ |/| | | [ticket/13756] Fix resize after upload with plupload
| * | | [ticket/13756] Add test for generate_resize_string()Oliver Schramm2015-04-121-0/+53
| | | | | | | | | | | | | | | | PHPBB3-13756
| * | | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
|/ / / | | | | | | | | | PHPBB3-13756
* | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-103-3/+3
| | |
* | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-108-9/+155
|\ \ \ | |/ /
| * | [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 tests
| * | [ticket/13749] Add missing slash to base uri in helper route testsMarc Alexander2015-04-061-1/+1
|/ / | | | | | | PHPBB3-13749
* | 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 it
| * | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-113-1/+55
| | | | | | | | | | | | PHPBB3-13493
* | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-063-1/+30
|\ \ \ | | | | | | | | | | | | [ticket/13710] Allow template events near smilies display
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 00:13:35 +0000