Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3697 from Elsensee/ticket/13833-30x | Marc Alexander | 2015-06-08 | 2 | -2/+2 |
|\ | | | | | | | [ticket/13833] Prevent flooding if type=submit doesn't exist | ||||
| * | [ticket/13833] Prevent flooding if type=submit doesn't exist | Oliver Schramm | 2015-06-08 | 2 | -2/+2 |
|/ | | | | PHPBB3-13833 | ||||
* | Merge pull request #3639 from marc1706/ticket/13875 | Andreas Fischer | 2015-05-29 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | [ticket/13875] Ignore cache, ext, and store folder in lint test * marc1706/ticket/13875: [ticket/13875] Ignore cache, ext, and store folder in lint test | ||||
| * | [ticket/13875] Ignore cache, ext, and store folder in lint test | Marc Alexander | 2015-05-28 | 1 | -0/+2 |
|/ | | | | PHPBB3-13875 | ||||
* | Merge branch 'prep-release-3.0.14' into 3.0.x | Andreas Fischer | 2015-05-03 | 2 | -1/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * 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 Fischer | 2015-05-03 | 1 | -0/+4 |
| | | |||||
| * | [prep-release-3.0.14] Bump version numbers for 3.0.14 release. | Andreas Fischer | 2015-05-03 | 4 | -6/+12 |
| | | |||||
* | | Merge pull request #3575 from marc1706/ticket/13792 | Tristan Darricau | 2015-05-02 | 1 | -9/+1 |
|\ \ | | | | | | | | | | [ticket/13792] Use hhvm instead of manually installing nightlys for now | ||||
| * | | [ticket/13792] Use hhvm instead of manually installing nightlys for now | Marc Alexander | 2015-05-01 | 1 | -9/+1 |
|/ / | | | | | | | | | | | | | Nightly builds are currently not supported because packages for precise no longer exist and travis is still running on it. PHPBB3-13792 | ||||
* | | Merge branch 'prep-release-3.0.14' into 3.0.x | Andreas Fischer | 2015-04-28 | 2 | -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 Fischer | 2015-04-28 | 2 | -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 | ||||
| | * | [ticket/security-180] Add tests for redirecting to main URL | Marc Alexander | 2015-04-23 | 1 | -0/+2 |
| | | | | | | | | | | | | SECURITY-180 | ||||
| | * | [ticket/security-180] Always fail when redirecting to an insecure URL | Joas Schilling | 2015-04-11 | 2 | -4/+4 |
| | | | | | | | | | | | | SECURITY-180 | ||||
| | * | [ticket/security-180] Make sure that redirect goes to full URL plus slash | Marc Alexander | 2015-04-11 | 2 | -1/+4 |
| | | | | | | | | | | | | SECURITY-180 | ||||
| | * | [ticket/security-180] Check if redirect URL contains board URL | Marc Alexander | 2015-04-10 | 1 | -0/+6 |
| | | | | | | | | | | | | SECURITY-180 | ||||
* | | | [3.0.x] Increment version number to 3.0.15-dev. | Andreas Fischer | 2015-04-28 | 4 | -6/+6 |
|/ / | |||||
* | | [3.0.x] Add changelog for 3.0.14 release. | Andreas Fischer | 2015-04-28 | 1 | -0/+26 |
| | | |||||
* | | [3.0.x] Bump version numbers for 3.0.14-RC1 release. | Andreas Fischer | 2015-04-27 | 4 | -7/+19 |
| | | |||||
* | | [3.0.x] Bumping version numbers to final for 3.0.14 releases. | Andreas Fischer | 2015-04-27 | 10 | -12/+12 |
| | | |||||
* | | Merge pull request #3549 from bantu/ticket/13765 | Andreas Fischer | 2015-04-25 | 2 | -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. | ||||
| * | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. | Joas Schilling | 2015-04-25 | 2 | -2/+2 |
|/ | | | | PHPBB3-13765 | ||||
* | Merge pull request #3512 from bantu/ticket/13738 | Joas Schilling | 2015-04-03 | 1 | -5/+5 |
|\ | | | | | | | [ticket/13738] Use new branch names in sami-all.conf.php. | ||||
| * | [ticket/13738] Use new branch names in sami-all.conf.php. | Andreas Fischer | 2015-04-02 | 1 | -5/+5 |
|/ | | | | PHPBB3-13738 | ||||
* | Merge pull request #3359 from marc1706/ticket/13568 | Nicofuma | 2015-03-29 | 3 | -5/+88 |
|\ | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359 | ||||
| * | [ticket/13568] Also check if absolute_path_writable is writable | Marc Alexander | 2015-02-06 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Use correct data provider on windows | Marc Alexander | 2015-02-03 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Add imagick tests for windows | Marc Alexander | 2015-02-02 | 1 | -8/+40 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Correctly check rpath and rwpath validation options | Marc Alexander | 2015-02-02 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Add more test cases for imagick path | Marc Alexander | 2015-02-02 | 1 | -0/+2 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Use more descriptive validation names and merge with path block | Marc Alexander | 2015-02-02 | 2 | -40/+9 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Add functional test for imagick path setting | Marc Alexander | 2015-02-02 | 1 | -0/+44 |
| | | | | | | | | PHPBB3-13568 | ||||
| * | [ticket/13568] Validate imagick path as readable absolute path | Marc Alexander | 2015-02-02 | 2 | -1/+37 |
| | | | | | | | | PHPBB3-13568 | ||||
* | | Merge pull request #3493 from prototech/ticket/13555 | Andreas Fischer | 2015-03-26 | 1 | -3/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | [ticket/13555] Render poll options separately when previewing. * prototech/ticket/13555: [ticket/13555] Render poll options separately when previewing. | ||||
| * | | [ticket/13555] Render poll options separately when previewing. | JoshyPHP | 2015-03-19 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | This prevents an option from being split into two when a line break is present inside of it. PHPBB3-13555 | ||||
* | | | Merge pull request #3505 from Nicofuma/ticket/13723 | Oliver Schramm | 2015-03-25 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | | | | [ticket/13723] Add Elsensee to authors list | ||||
| * | | [ticket/13723] Add Elsensee to authors list | Nicofuma | 2015-03-25 | 1 | -1/+2 |
|/ / | | | | | | | PHPBB3-13723 | ||||
* | | Merge pull request #3443 from naderman/ticket/13617 | Joas Schilling | 2015-02-27 | 1 | -1/+3 |
|\ \ | | | | | | | | | | [ticket/13617] Enforce column size limit for session_forum_id | ||||
| * | | [ticket/13617] Enforce column size limit for session_forum_id | Nils Adermann | 2015-02-25 | 1 | -1/+3 |
| | | | | | | | | | | | | PHPBB3-13617 | ||||
* | | | Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x | Andreas Fischer | 2015-02-19 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | [ticket/13634] Update branch names on README * VSEphpbb/ticket/13634-3.0.x: [ticket/13634] Update links to travis build icons [ticket/13634] Update branch names on README | ||||
| * | | [ticket/13634] Update links to travis build icons | Matt Friedman | 2015-02-18 | 1 | -3/+3 |
| | | | | | | | | | PHPBB3-13634 | ||||
| * | | [ticket/13634] Update branch names on README | Matt Friedman | 2015-02-18 | 1 | -3/+3 |
|/ / | | | | | PHPBB3-13634 | ||||
* | | Merge pull request #3393 from bantu/ticket/13599 | Marc Alexander | 2015-02-13 | 3 | -70/+2 |
|\ \ | | | | | | | | | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported. | ||||
| * | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported. | Andreas Fischer | 2015-02-12 | 3 | -70/+2 |
|/ / | | | | | | | PHPBB3-13599 | ||||
* | | Merge pull request #3365 from marc1706/ticket/13348-olympus | Andreas Fischer | 2015-02-03 | 1 | -5/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13348] Use close method to free query result handle * marc1706/ticket/13348-olympus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle | ||||
| * | | [ticket/13348] Remove unnecessary global $cache | Marc Alexander | 2015-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | $cache is not used in the method get_item(). PHPBB3-13348 | ||||
| * | | [ticket/13348] Use close method to free query result handle | Marc Alexander | 2015-02-03 | 1 | -4/+6 |
|/ / | | | | | | | PHPBB3-13348 | ||||
* | | Merge pull request #3363 from Nicofuma/ticket/13572 | Andreas Fischer | 2015-02-03 | 1 | -0/+0 |
|\ \ | |/ |/| | | | | | | | | | [ticket/13572] Update composer to version 1.0.0-alpha9 * Nicofuma/ticket/13572: [ticket/13572] Update composer to version 1.0.0-alpha9 | ||||
| * | [ticket/13572] Update composer to version 1.0.0-alpha9 | Nicofuma | 2015-02-03 | 1 | -0/+0 |
|/ | | | | PHPBB3-13572 | ||||
* | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-30 | 3 | -29/+39 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql | ||||
| * | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. | Andreas Fischer | 2015-01-30 | 1 | -2/+2 |
| | |