aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympusDhruv2015-01-291-1/+1
|\
| * Merge pull request #3347 from bantu/ticket/13554Dhruv Goel2015-01-291-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 Fischer2015-01-281-1/+1
| | | | | | | | | | | | PHPBB3-13554
* | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * 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/13549Andreas Fischer2015-01-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [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 Alexander2015-01-281-1/+1
| | |/ | | | | | | | | | | | | | | | | | | 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-olympusAndreas Fischer2015-01-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word
| * | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| |/ | | | | | | PHPBB3-12933
* | [ticket/13414] Set Content-Length header only if status is not 304Marc Alexander2015-01-281-5/+7
| | | | | | | | PHPBB3-13414
* | Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-262-2/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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 releaseNils Adermann2015-01-263-3/+9
| |
| * [prep-release-3.0.13] Highlight security relevant changesNils Adermann2015-01-261-2/+5
| |
* | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-213-3/+3
|/
* [develop-olympus] Add changelog for 3.0.13 release.Andreas Fischer2015-01-211-28/+162
|
* [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-213-5/+11
|
* [develop-olympus] Bumping version numbers to final for 3.0.13 releases.Andreas Fischer2015-01-2110-12/+12
|
* [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| | | | PHPBB3-13531
* [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-211-0/+34
| | | | PHPBB3-13531
* Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-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 Fischer2015-01-201-1/+1
| | | | | | | | PHPBB3-13527
| * [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | PHPBB3-13527
* | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-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 Schilling2015-01-201-1/+5
| |/ | | | | | | PHPBB3-13526
* | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-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 stringMarc Alexander2015-01-191-1/+1
| | | | | | | | PHPBB3-13519
* | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
|\ \ | |/ |/| [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| * [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | PHPBB3-10985
* | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| | | | | | | | PHPBB3-11613
* | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3Nils Adermann2014-11-251-23/+5
| | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376
* | [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctnessCrizzo2014-11-221-0/+2
| | | | | | | | PHPBB3-10442
* | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
| | | | | | | | PHPBB3-13324
* | Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
|\ \ | | | | | | | | | Ticket/13234
| * | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | PHPBB3-13234
| * | [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
|/ / | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234
* | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
| | | | | | | | PHPBB3-12120
* | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | PHPBB3-13168
* | | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
|/ / | | | | | | PHPBB3-13138
* | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-061-2/+14
|\ \ | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
| * | [ticket/11224] Remove new line in acm_memory.phpTristan Darricau2014-05-151-1/+1
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Fix coding styleTristan Darricau2014-05-151-2/+2
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Fix the blank line after ?>Tristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Fix returned dataTristan Darricau2014-05-141-2/+2
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] SQL cache destroy does not destroy queries to tables joinedTristan Darricau2014-05-141-3/+15
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11224 PHPBB3-11224
* | | [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
| | | | | | | | | | | | PHPBB3-13086
* | | [ticket/13096] Add phpbb_ prefix to ldap_escape()Jakub Senko2014-09-231-2/+2
| |/ |/| | | | | PHPBB3-13096
* | Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-231-8/+20
|\ \ | | | | | | | | | Ticket/10729 Update editor information when user being deleted
| * | [ticket/10729] Fix doc block for user_deleteJoas Schilling2014-09-221-3/+8
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
| | | | | | | | | | | | PHPBB3-10729