aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13243
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-091-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | 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 branch 'develop-ascraeus' into developTristan Darricau2014-11-071-0/+31
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
| * | | | | | 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
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-071-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13303] Speed up migration dependency calculation.
| * | | | | | [ticket/13303] Speed up migration dependency calculation.Cesar G2014-11-071-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13303
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-072-4/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13280] Remove unneeded str_replace in build_url() [ticket/13280] Only run sanitizer for server superglobal and modify tests [ticket/13280] Seperate server sanitizer call and add comment [ticket/13280] Add additional sanitizer for ampersands in server superglobal [ticket/13280] Correctly format user page for build_url() [ticket/13280] Properly format the current page and add sanitizer to tests
| * | | | | [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-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| * | | | | [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-031-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13280
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-028-10/+183
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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 phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/memberlist_email.html
| * | | | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-028-10/+183
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-021-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13271: [ticket/13271] Disable CC sender feature for anonymous users
| | | * | | | | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-021-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13271
| | * | | | | [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] 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
| | * | | | | [ticket/13268] Properly append ternary result in get_existing_indexes()Patrick Webster2014-11-011-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13268
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-291-19/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12703] Only query database for subscription types once
| * | | | | Merge pull request #3076 from marc1706/ticket/12703Andreas Fischer2014-10-291-19/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12703] Only query database for subscription types once * marc1706/ticket/12703: [ticket/12703] Only query database for subscription types once
| | * | | | [ticket/12703] Only query database for subscription types onceMarc Alexander2014-10-261-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12703
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-281-28/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/13234 2
| | * | | | | [ticket/13234-2] Correctly verify that user_id is set in user data arrayNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13234-2
| | * | | | | [ticket/13234-2] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-29/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit PHPBB3-13234
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-283-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-283-3/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [ticket/13232] Fix more issues with TTL and global cache fileJoas Schilling2014-10-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13232
| | * | | | | [ticket/13232] Fix indentationNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13232
| | * | | | | [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasksNils Adermann2014-10-271-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13232
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-272-1/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13227] Properly handle curlwrapper headers in remote avatars [ticket/13231] Update the dependencies of the migration contact_admin_form
| * | | | | Merge pull request #3085 from naderman/ticket/13227Nils Adermann2014-10-271-1/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/13227] Properly handle curlwrapper headers in remote avatars
| | * | | | | [ticket/13227] Properly handle curlwrapper headers in remote avatarsNils Adermann2014-10-271-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read a bit of the file to ensure header values are populated and then handle headers in the nested array structure too. PHPBB3-13227
| * | | | | | Merge pull request #3083 from Nicofuma/ticket/13231Nils Adermann2014-10-271-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | [ticket/13231] Update the dependencies of the migration contact_admin_form
| | * | | | | [ticket/13231] Update the dependencies of the migration contact_admin_formTristan Darricau2014-10-271-0/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13231
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-271-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1Marc Alexander2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13225
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 14:03:36 +0000