| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3118 from prototech/ticket/13270 | Tristan Darricau | 2014-11-07 | 1 | -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 G | 2014-11-07 | 1 | -0/+31 |
| | | | | | | | | | PHPBB3-13270 | ||||
| * | | [ticket/13303] Speed up migration dependency calculation. | Cesar G | 2014-11-07 | 1 | -1/+9 |
| |/ | | | | PHPBB3-13303 | ||||
| * | [ticket/13280] Remove unneeded str_replace in build_url() | Marc Alexander | 2014-11-06 | 1 | -1/+1 |
| | | | | | PHPBB3-13280 | ||||
| * | [ticket/13280] Only run sanitizer for server superglobal and modify tests | Marc Alexander | 2014-11-04 | 1 | -3/+3 |
| | | | | | PHPBB3-13280 | ||||
| * | [ticket/13280] Seperate server sanitizer call and add comment | Marc Alexander | 2014-11-04 | 1 | -0/+2 |
| | | | | | PHPBB3-13280 | ||||
| * | [ticket/13280] Add additional sanitizer for ampersands in server superglobal | Marc Alexander | 2014-11-03 | 2 | -2/+7 |
| | | | | | PHPBB3-13280 | ||||
| * | [ticket/13280] Correctly format user page for build_url() | Marc Alexander | 2014-11-03 | 1 | -1/+2 |
| | | | | | PHPBB3-13280 | ||||
| * | [ticket/13280] Properly format the current page and add sanitizer to tests | Marc Alexander | 2014-11-03 | 1 | -3/+3 |
| | | | | | PHPBB3-13280 | ||||
| * | Merge branch 'prep-release-3.1.1' into develop-ascraeus | Nils Adermann | 2014-11-02 | 21 | -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 Adermann | 2014-11-02 | 2 | -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_name | Marc Alexander | 2014-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | SECURITY-164 | ||||
| | | * | [ticket/security-164] Sanitize all global variables in symfony_request class | Marc Alexander | 2014-11-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | SECURITY-164 | ||||
| | * | | Merge branch 'ticket/13271' into prep-release-3.1.1 | Nils Adermann | 2014-11-02 | 3 | -1/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | * ticket/13271: [ticket/13271] Disable CC sender feature for anonymous users | ||||
| | | * | | [ticket/13271] Disable CC sender feature for anonymous users | Nils Adermann | 2014-11-02 | 3 | -1/+5 |
| | | | | | | | | | | | | | | | | | PHPBB3-13271 | ||||
| | * | | | [prep-release-3.1.1] Add 3.1.1 CHANGELOG | Nils Adermann | 2014-11-02 | 1 | -0/+19 |
| | | | | | |||||
| | * | | | [prep-release-3.1.1] Add 3.1.1 migration file | Nils Adermann | 2014-11-02 | 1 | -0/+32 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'github-marc1706/ticket/13263' into ↵ | Nils Adermann | 2014-11-01 | 1 | -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 code | Marc Alexander | 2014-11-01 | 1 | -47/+12 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13263 | ||||
| | | * | | | [ticket/13263] Only install/set prosilver if no style available | Marc Alexander | 2014-11-01 | 1 | -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 exist | Marc Alexander | 2014-11-01 | 1 | -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 name | Marc Alexander | 2014-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13248 | ||||
| | * | | | [ticket/13248] Always use provider collection for getting provider | Marc Alexander | 2014-11-01 | 3 | -7/+8 |
| | | | | | | | | | | | | | | | | | PHPBB3-13248 | ||||
| | * | | | [ticket/13248] Allow specifying different auth provider in provider collection | Marc Alexander | 2014-11-01 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | PHPBB3-13248 | ||||
| | * | | | [ticket/13248] Use auth provider collection for getting provider | Marc Alexander | 2014-11-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-13248 | ||||
| | * | | | Merge branch 'ticket/13262' into prep-release-3.1.1 | Nils Adermann | 2014-11-01 | 1 | -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.1 | Matt Friedman | 2014-11-01 | 1 | -2/+2 |
| | | | |/ | | |/| | | | | | | | | | PHPBB3-13262 | ||||
| | * | | | Merge branch 'ticket/13267' into prep-release-3.1.1 | Nils Adermann | 2014-11-01 | 2 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * ticket/13267: [ticket/13267] Update Automatic Update instructions to include vendor directory | ||||
| | | * | | | [ticket/13267] Update Automatic Update instructions to include vendor directory | Patrick Webster | 2014-11-01 | 2 | -2/+2 |
| | | |/ / | | | | | | | | | | | | | PHPBB3-13267 | ||||
| | * | | | [ticket/13268] Properly append ternary result in get_existing_indexes() | Patrick Webster | 2014-11-01 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | PHPBB3-13268 | ||||
| | * | | [prep-release-3.1.1] Update version number to 3.1.1 | Nils Adermann | 2014-11-01 | 5 | -7/+7 |
| | |/ | |||||
| * | | Merge pull request #3098 from VSEphpbb/ticket/13262 | Marc Alexander | 2014-11-01 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | [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.1 | Matt Friedman | 2014-10-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-13262 | ||||
| * | | | [ticket/13253] Fix MCP queue link in active topics search. | Cesar G | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13253 | ||||
| * | | | Merge pull request #3093 from nickvergessen/ticket/13241 | Andreas Fischer | 2014-10-29 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13241] Fix pagination of viewforum with global announcements * nickvergessen/ticket/13241: [ticket/13241] Remove sleep() and change flood interval instead [ticket/13241] Remove sleep() since the method takes care of this now [ticket/13241] Sleep for 1 second when posting twice in the same second [ticket/13241] Fix pagination with global announcements [ticket/13241] Correctly ignore announcements from topics list [ticket/13241] Add a functional test for viewforum with global announcement | ||||
| | * | | | [ticket/13241] Fix pagination with global announcements | Joas Schilling | 2014-10-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13241 | ||||
| | * | | | [ticket/13241] Correctly ignore announcements from topics list | Joas Schilling | 2014-10-29 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | PHPBB3-13241 | ||||
| * | | | Merge pull request #3076 from marc1706/ticket/12703 | Andreas Fischer | 2014-10-29 | 1 | -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 once | Marc Alexander | 2014-10-26 | 1 | -19/+25 |
| | | | | | | | | | | | | | PHPBB3-12703 | ||||
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Joas Schilling | 2014-10-28 | 1 | -0/+10 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | [prep-release-3.1.0] Update changelog with final changes | Joas Schilling | 2014-10-28 | 1 | -0/+10 |
| | | | | |||||
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Joas Schilling | 2014-10-28 | 1 | -28/+37 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3091 from Nicofuma/ticket/13234-2 | Joas Schilling | 2014-10-28 | 1 | -28/+37 |
| | |\ \ | | | | | | | | | | | | | Ticket/13234 2 | ||||
| | | * | | [ticket/13234-2] Correctly verify that user_id is set in user data array | Nils Adermann | 2014-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13234-2 | ||||
| | | * | | [ticket/13234-2] Never allow autologin/remember me to modify the userid | Nils Adermann | 2014-10-27 | 1 | -29/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit PHPBB3-13234 | ||||
| * | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Joas Schilling | 2014-10-28 | 4 | -5/+6 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0 | Joas Schilling | 2014-10-28 | 4 | -5/+6 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | [ticket/13232] Fix more issues with TTL and global cache file | Joas Schilling | 2014-10-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-13232 | ||||
| | | * | | [ticket/13232] Fix indentation | Nils Adermann | 2014-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13232 | ||||
| | | * | | [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks | Nils Adermann | 2014-10-27 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | PHPBB3-13232 | ||||
