| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [ticket/11033] Update string to reflect real requirements | Jakub Senko | 2014-11-22 | 1 | -1/+1 |
| | | | | | PHPBB3-11033 | ||||
| * | 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 | ||||
| * | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-27 | 2 | -1/+22 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [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/13227 | Nils Adermann | 2014-10-27 | 1 | -1/+17 |
| | |\ \ \ | | | | | | | | | | | [ticket/13227] Properly handle curlwrapper headers in remote avatars | ||||
| | | * | | | [ticket/13227] Properly handle curlwrapper headers in remote avatars | Nils Adermann | 2014-10-27 | 1 | -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/13231 | Nils Adermann | 2014-10-27 | 1 | -0/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | [ticket/13231] Update the dependencies of the migration contact_admin_form | ||||
| | | * | | | | [ticket/13231] Update the dependencies of the migration contact_admin_form | Tristan Darricau | 2014-10-27 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13231 | ||||
| * | | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-27 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13229] Fix overloading memberlist with redundant SQL queries | ||||
| | * | | | | | [ticket/13229] Fix overloading memberlist with redundant SQL queries | rxu | 2014-10-27 | 2 | -3/+3 |
| | | |/ / / | |/| | | | | | | | | | | | | | PHPBB3-13229 | ||||
| * | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Joas Schilling | 2014-10-27 | 1 | -1/+4 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3077 from marc1706/ticket/13225 | Joas Schilling | 2014-10-27 | 1 | -1/+4 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | [ticket/13225] Use passwords manager instead of phpbb_hash in migration | ||||
| | | * | | | [ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1 | Marc Alexander | 2014-10-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13225 | ||||
| | | * | | | [ticket/13225] Use passwords manager instead of phpbb_hash in migration | Marc Alexander | 2014-10-26 | 1 | -1/+4 |
| | | |/ / | | | | | | | | | | | | | PHPBB3-13225 | ||||
| * | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-27 | 2 | -4/+7 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | * prep-release-3.1.0: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img | ||||
| | * | | Merge remote-tracking branch 'github-nicofuma/ticket/13226' into ↵ | Nils Adermann | 2014-10-27 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.0 * github-nicofuma/ticket/13226: [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img | ||||
| | | * | | [ticket/13226] Fix the usage of $rank_img | Tristan Darricau | 2014-10-27 | 1 | -2/+2 |
| | | |/ | | | | | | | | | | PHPBB3-13226 | ||||
| | * | | [ticket/13230] Add missing globals and missing request object for path helper | Joas Schilling | 2014-10-27 | 1 | -2/+5 |
| | |/ | | | | | | | PHPBB3-13230 | ||||
| * | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-26 | 1 | -0/+2 |
| |\ \ | |/ | | | | | | | * prep-release-3.1.0: [prep-release-3.1.0] Update CHANGELOG with last minute changes | ||||
| | * | [prep-release-3.1.0] Update CHANGELOG with last minute changes | Nils Adermann | 2014-10-26 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-26 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | * prep-release-3.1.0: [ticket/13223] Fix USERNAME email template variable in notification | ||||
| | * | [ticket/13223] Fix USERNAME email template variable in notification | rxu | 2014-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | admin_activate_user.php notification type is assigning usernames to email template variables using user_loader->get_username() in 'no_profile' mode, which in its turn calls get_username_string() function in 'no_profile' mode. This causes HTML markup in emails for username colour. PHPBB3-13223 | ||||
| * | | Merge branch 'prep-release-3.1.0' into develop-ascraeus | Nils Adermann | 2014-10-26 | 4 | -122/+151 |
| |\ \ | |/ | | | | | | | | | * prep-release-3.1.0: [ticket/13221] Add bot_update as a dependency to gold [ticket/13221] Perform bot updates after user table changes | ||||
| | * | [ticket/13221] Add bot_update as a dependency to gold | Joas Schilling | 2014-10-26 | 1 | -0/+1 |
| | | | | | | | | | PHPBB3-13221 | ||||
| | * | [ticket/13221] Perform bot updates after user table changes | Joas Schilling | 2014-10-26 | 3 | -122/+150 |
| | | | | | | | | | PHPBB3-13221 | ||||
| * | | Merge pull request #3054 from Senky/ticket/13193 | Andreas Fischer | 2014-10-26 | 2 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs | ||||
| | * | | [ticket/13193] Swap ternary condition members | Jakub Senko | 2014-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13193 | ||||
| | * | | [ticket/13193] Make template more readable | Jakub Senko | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13193 | ||||
| | * | | [ticket/13193] Add load_search config check | Jakub Senko | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13193 | ||||
| | * | | [ticket/13193] Add link to post count in PMs | Jakub Senko | 2014-10-21 | 2 | -1/+2 |
| | | | | | | | | | | | | | PHPBB3-13193 | ||||
| * | | | [develop-ascraeus] Update version number to 3.1.1-RC1-dev | Nils Adermann | 2014-10-25 | 2 | -2/+2 |
| | |/ |/| | |||||
| * | | [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 | Nils Adermann | 2014-10-25 | 1 | -0/+2 |
| | | | |||||
| * | | [prep-release-3.1.0] Add CHANGELOG for 3.1.0 | Nils Adermann | 2014-10-25 | 1 | -0/+16 |
| | | | |||||
| * | | [prep-release-3.1.0] Add 3.1.0 gold release migration | Nils Adermann | 2014-10-25 | 1 | -0/+31 |
| | | | |||||
| * | | [ticket/13207] Move default user notifications settings to user_add() | Marc Alexander | 2014-10-25 | 2 | -14/+18 |
| | | | | | | | | | PHPBB3-13207 | ||||
| * | | [ticket/13207] Add default subscription options for newly registered users | Marc Alexander | 2014-10-25 | 2 | -2/+24 |
| | | | | | | | | | PHPBB3-13207 | ||||
