Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | [prep-release-3.0.13] Also update version in references to files. | Andreas Fischer | 2015-01-29 | 1 | -3/+3 |
| | | |||||
| * | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. | Andreas Fischer | 2015-01-29 | 1 | -0/+10 |
| | | |||||
| * | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. | Andreas Fischer | 2015-01-29 | 1 | -24/+24 |
| | | |||||
| * | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. | Andreas Fischer | 2015-01-29 | 4 | -6/+12 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympus | Dhruv | 2015-01-29 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge pull request #3347 from bantu/ticket/13554 | Dhruv Goel | 2015-01-29 | 1 | -1/+1 |
| |\ | | | | | | | [ticket/13554] Show feature release upgrades in blue rather than red. | ||||
| | * | [ticket/13554] Show feature release upgrades in blue rather than red. | Andreas Fischer | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-13554 | ||||
* | | | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-29 | 2 | -2/+7 |
|\ \ \ | |/ / | | | | | | | | | | * prep-release-3.0.13: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. | ||||
| * | | Merge pull request #3348 from bantu/ticket/13549 | Andreas Fischer | 2015-01-29 | 2 | -2/+7 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. | ||||
| | * | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. | Marc Alexander | 2015-01-28 | 2 | -2/+7 |
| | |/ | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549 | ||||
* | | | Merge branch 'prep-release-3.0.13' into develop-olympus | Andreas Fischer | 2015-01-29 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | * prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word | ||||
| * | | Merge pull request #3349 from bantu/ticket/12933 | Andreas Fischer | 2015-01-29 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | [ticket/12933] Handle case when * is last character of word * bantu/ticket/12933: [ticket/12933] Handle case when * is last character of word | ||||
| | * | [ticket/12933] Handle case when * is last character of word | Dhruv | 2015-01-28 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-12933 | ||||
* | | Merge pull request #3343 from marc1706/ticket/13414 | Andreas Fischer | 2015-01-28 | 1 | -5/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | [ticket/13414] Set Content-Length header only if status is not 304 * marc1706/ticket/13414: [ticket/13414] Set Content-Length header only if status is not 304 | ||||
| * | | [ticket/13414] Set Content-Length header only if status is not 304 | Marc Alexander | 2015-01-28 | 1 | -5/+7 |
|/ / | | | | | | | PHPBB3-13414 | ||||
* | | Merge branch 'prep-release-3.0.13' into develop-olympus | Nils Adermann | 2015-01-26 | 3 | -3/+12 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql | ||||
| * | [prep-release-3.0.13] Bump version numbers for 3.0.13 release | Nils Adermann | 2015-01-26 | 4 | -6/+12 |
| | | |||||
| * | [prep-release-3.0.13] Highlight security relevant changes | Nils Adermann | 2015-01-26 | 1 | -2/+5 |
| | | |||||
* | | Merge pull request #3339 from nickvergessen/ticket/12089 | Andreas Fischer | 2015-01-26 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | [ticket/12089] Add assert message on HTTP status code check * nickvergessen/ticket/12089: [ticket/12089] Add assert message on HTTP status code check | ||||
| * | | [ticket/12089] Add assert message on HTTP status code check | Joas Schilling | 2015-01-25 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-12089 | ||||
* | | [develop-olympus] Increment version number to 3.0.14-dev. | Andreas Fischer | 2015-01-21 | 4 | -6/+6 |
|/ | |||||
* | [develop-olympus] Add changelog for 3.0.13 release. | Andreas Fischer | 2015-01-21 | 1 | -28/+162 |
| | |||||
* | [develop-olympus] Bump version numbers for 3.0.13-RC1 release. | Andreas Fischer | 2015-01-21 | 4 | -6/+12 |
| | |||||
* | [develop-olympus] Bumping version numbers to final for 3.0.13 releases. | Andreas Fischer | 2015-01-21 | 10 | -12/+12 |
| | |||||
* | Merge pull request #3316 from bantu/ticket/13531 | Nils Adermann | 2015-01-21 | 2 | -0/+103 |
|\ | | | | | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO). | ||||
| * | [ticket/13531] Send 404 Not Found. | Andreas Fischer | 2015-01-21 | 1 | -1/+15 |
| | | | | | | | | PHPBB3-13531 | ||||
| * | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO). | Marc Alexander | 2015-01-21 | 2 | -0/+89 |
|/ | | | | PHPBB3-13531 | ||||
* | Merge pull request #3312 from bantu/ticket/13527 | Andreas Fischer | 2015-01-20 | 1 | -4/+1 |
|\ | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables. | ||||
| * | [ticket/13527] Apply htmlspecialchars() to data from version server. | Andreas Fischer | 2015-01-20 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13527 | ||||
| * | [ticket/13527] Remove two unused variables. | Andreas Fischer | 2015-01-20 | 1 | -3/+0 |
| | | | | | | | | PHPBB3-13527 | ||||
* | | Merge pull request #3311 from bantu/ticket/13526 | Andreas Fischer | 2015-01-20 | 1 | -1/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key. * bantu/ticket/13526: [ticket/13526] Correctly validate the ucp_pm_options form key. | ||||
| * | | [ticket/13526] Correctly validate the ucp_pm_options form key. | Joas Schilling | 2015-01-20 | 1 | -1/+5 |
| |/ | | | | | | | PHPBB3-13526 | ||||
* | | Merge pull request #3306 from marc1706/ticket/13519 | Andreas Fischer | 2015-01-20 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string | ||||
| * | [ticket/13519] Correctly validate imagick path as path and not string | Marc Alexander | 2015-01-19 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13519 | ||||
* | | Merge pull request #3310 from bantu/ticket/13523 | Joas Schilling | 2015-01-20 | 2 | -2/+24 |
|\ \ | | | | | | | | | | [ticket/13523] Install PHPUnit manually instead of from PEAR. | ||||
| * | | [ticket/13523] Install PHPUnit manually instead of from PEAR. | Andreas Fischer | 2015-01-20 | 2 | -2/+24 |
|/ / | | | | | | | | | | | The pear.phpunit.de channel has been shut down in 2014. PHPBB3-13523 |