aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-064-21/+203
|\ | | | | | | Ticket/13807 Allow building changesets for the event list
| * [ticket/13807] Add version to the usage outputJoas Schilling2015-05-051-1/+1
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Only output the header for diffJoas Schilling2015-05-021-6/+7
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-023-14/+68
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-022-6/+106
| | | | | | | | PHPBB3-13807
* | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| | | | | | | | PHPBB3-13819
* | Merge pull request #3562 from VSEphpbb/ticket/11521Tristan Darricau2015-05-041-0/+7
|\ \ | | | | | | | | | [ticket/11521] Add missing lang strings for migration exceptions
| * | [ticket/11521] Add missing lang strings for migration exceptionsMatt Friedman2015-04-281-0/+7
| | | | | | | | | | | | PHPBB3-11521
* | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-032-0/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | [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
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml
| * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-032-0/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | [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 ↵Andreas Fischer2015-04-281-1/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.xJoas Schilling2015-04-291-0/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | [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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | [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-281-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | 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-281-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | SECURITY-180
* | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-283-1/+64
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 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-283-1/+64
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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 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
* | | | | [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-261-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13755] Ignore dots in path when determining file extension.
| * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13755
* | | | | 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 #3359 from marc1706/ticket/13568Nicofuma2015-03-292-5/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359
* | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13772
* | | | | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13763
* | | | | [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-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
| | |