aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
| | | | | | | This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb. PHPBB3-13280
* Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-111-22/+18
|\ | | | | | | | | * develop-olympus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| * [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
* | Merge pull request #3112 from Elsensee/ticket/13083Tristan Darricau2014-11-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logs * Elsensee/ticket/13083: [ticket/13083] Fix language string NO_ENTRIES for logs
| * | [ticket/13083] Fix language string NO_ENTRIES for logsOliver Schramm2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | The string was misleading because there does not always have to be a period when viewing log entries. PHPBB3-13083
* | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
|\ \ \ | | | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php.
| * | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
| | | | | | | | | | | | | | | | PHPBB3-13251
* | | | Merge pull request #3121 from Elsensee/ticket/13300Joas Schilling2014-11-093-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled
| * | | | [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-093-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13300
* | | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13301] Fix called function in apche auth module
| * | | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13301
* | | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13243
* | | | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13242] Fix HTML validity
| * | | | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-13242
* | | | Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeusCesar G2014-11-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/13265: [ticket/13265] Don't show link to edit own profile to those without permission
| * | | | [ticket/13265] Don't show link to edit own profile to those without permissionOliver Schramm2014-11-051-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13265
* | | | Merge pull request #3118 from prototech/ticket/13270Tristan Darricau2014-11-071-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. * prototech/ticket/13270: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
| * | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.Cesar G2014-11-071-0/+31
| | |/ / | |/| | | | | | | | | | PHPBB3-13270
* | | | [ticket/13303] Speed up migration dependency calculation.Cesar G2014-11-071-1/+9
|/ / / | | | | | | | | | PHPBB3-13303
* | | [ticket/13280] Remove unneeded str_replace in build_url()Marc Alexander2014-11-061-1/+1
| | | | | | | | | | | | PHPBB3-13280
* | | [ticket/13280] Only run sanitizer for server superglobal and modify testsMarc Alexander2014-11-041-3/+3
| | | | | | | | | | | | PHPBB3-13280
* | | [ticket/13280] Seperate server sanitizer call and add commentMarc Alexander2014-11-041-0/+2
| | | | | | | | | | | | PHPBB3-13280
* | | [ticket/13280] Add additional sanitizer for ampersands in server superglobalMarc Alexander2014-11-032-2/+7
| | | | | | | | | | | | PHPBB3-13280
* | | [ticket/13280] Correctly format user page for build_url()Marc Alexander2014-11-031-1/+2
| | | | | | | | | | | | PHPBB3-13280
* | | [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-031-3/+3
|/ / | | | | | | PHPBB3-13280
* | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-0221-26/+223
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * \ Merge remote-tracking branch 'github-security/ticket/security-164-alt' into ↵Nils Adermann2014-11-022-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-security/ticket/security-164-alt: [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class
| | * | [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | | | | | | | | | | | | | | | SECURITY-164
| | * | [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| | | | | | | | | | | | | | | | SECURITY-164
| * | | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-023-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/13271: [ticket/13271] Disable CC sender feature for anonymous users
| | * | | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-023-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13271
| * | | | [prep-release-3.1.1] Add 3.1.1 CHANGELOGNils Adermann2014-11-021-0/+19
| | | | |
| * | | | [prep-release-3.1.1] Add 3.1.1 migration fileNils Adermann2014-11-021-0/+32
| | | | |
| * | | | Merge remote-tracking branch 'github-marc1706/ticket/13263' into ↵Nils Adermann2014-11-011-0/+136
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-marc1706/ticket/13263: [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist
| | * | | | [ticket/13263] Make sure default style exists and clean up codeMarc Alexander2014-11-011-47/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13263
| | * | | | [ticket/13263] Only install/set prosilver if no style availableMarc Alexander2014-11-011-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users that have a nonexistent style selectd will revert back to the default style. PHPBB3-13263
| | * | | | [ticket/13263] Use prosilver as default style if user's style doesn't existMarc Alexander2014-11-011-0/+175
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If prosilver is not installed for whatever reason, it will be installed by the newly added migration. PHPBB3-13263
| * | | | [ticket/13248] Correctly pass provider nameMarc Alexander2014-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| * | | | [ticket/13248] Always use provider collection for getting providerMarc Alexander2014-11-013-7/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| * | | | [ticket/13248] Allow specifying different auth provider in provider collectionMarc Alexander2014-11-011-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| * | | | [ticket/13248] Use auth provider collection for getting providerMarc Alexander2014-11-011-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| * | | | Merge branch 'ticket/13262' into prep-release-3.1.1Nils Adermann2014-11-011-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13262: [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
| | * | | | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-11-011-2/+2
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13262
| * | | | Merge branch 'ticket/13267' into prep-release-3.1.1Nils Adermann2014-11-012-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13267: [ticket/13267] Update Automatic Update instructions to include vendor directory
| | * | | | [ticket/13267] Update Automatic Update instructions to include vendor directoryPatrick Webster2014-11-012-2/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13267
| * | | | [ticket/13268] Properly append ternary result in get_existing_indexes()Patrick Webster2014-11-011-2/+2
| |/ / / | | | | | | | | | | | | PHPBB3-13268
| * | | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-015-7/+7
| |/ /
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-18 04:25:03 +0000