aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-28/+37
|\
| * Merge branch 'develop-olympus' into prep-release-3.1.0Joas Schilling2014-10-280-0/+0
| |\ | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php
| | * Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\ | | | | | | | | | | | | Ticket/13234
| * | \ Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
| |\ \ \ | | | | | | | | | | | | | | | Ticket/13234 2
| | * \ \ [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2Tristan Darricau2014-10-280-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13234: [ticket/13234] Fix conditions and CS Conflicts: phpBB/phpbb/session.php PHPBB3-13234
| | | * | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13234
| | * | | [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 'ticket/13234' into ticket/13234-2Nils Adermann2014-10-270-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * ticket/13234: [ticket/13234] Never allow autologin/remember me to modify the userid
| | | * | [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 branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-285-7/+8
|\ \ \ \ | |/ / /
| * | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-285-7/+8
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/13232] Fix spaces vs tabsJoas Schilling2014-10-281-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13232
| | * | [ticket/13232] Ensure prune cron job always gets run in prune testNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cron scheduler might pick a different task but we don't want to go through them all to find the one we need. So we just make sure cron is run at all and then manually run the one we want. PHPBB3-13232
| | * | Merge pull request #4 from nickvergessen/naderman-ticket/13232Nils Adermann2014-10-272-3/+3
| | |\ \ | | | | | | | | | | [ticket/13232] Fix more issues with TTL and global cache file
| | | * | [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-272-3/+4
| | | | | | | | | | | | | | | | PHPBB3-13232
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-272-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/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 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-272-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13229] Fix overloading memberlist with redundant SQL queries
| * | | | | Merge branch 'ticket/13229' into prep-release-3.1.0Nils Adermann2014-10-272-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * ticket/13229: [ticket/13229] Fix overloading memberlist with redundant SQL queries
| | * | | | [ticket/13229] Fix overloading memberlist with redundant SQL queriesrxu2014-10-272-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13229
* | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-271-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3077 from marc1706/ticket/13225Joas Schilling2014-10-271-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-RC1Marc Alexander2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13225
| | * | | [ticket/13225] Use passwords manager instead of phpbb_hash in migrationMarc Alexander2014-10-261-1/+4
| | |/ / | | | | | | | | | | | | PHPBB3-13225
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-273-4/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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 Adermann2014-10-272-2/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add functional test for group ranksTristan Darricau2014-10-271-0/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-13226
| | * | | [ticket/13226] Fix the usage of $rank_imgTristan Darricau2014-10-271-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13226
| * | | Merge pull request #3079 from nickvergessen/ticket/13230Nils Adermann2014-10-271-2/+5
| |\ \ \ | | |/ / | |/| | [ticket/13230] Add missing globals and missing request object for path helper
| | * | [ticket/13230] Add missing globals and missing request object for path helperJoas Schilling2014-10-271-2/+5
| |/ / | | | | | | | | | PHPBB3-13230
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-261-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 changesNils Adermann2014-10-261-0/+2
| | |
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-261-1/+1
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.1.0: [ticket/13223] Fix USERNAME email template variable in notification
| * | Merge branch 'ticket/13223' into prep-release-3.1.0Nils Adermann2014-10-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/13223: [ticket/13223] Fix USERNAME email template variable in notification
| | * | [ticket/13223] Fix USERNAME email template variable in notificationrxu2014-10-261-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-ascraeusNils Adermann2014-10-264-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
| * | Merge pull request #3073 from nickvergessen/ticket/13221Nils Adermann2014-10-264-122/+151
| |\ \ | | | | | | | | [ticket/13221] Perform bot updates after user table changes
| | * | [ticket/13221] Add bot_update as a dependency to goldJoas Schilling2014-10-261-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13221
| | * | [ticket/13221] Perform bot updates after user table changesJoas Schilling2014-10-263-122/+150
| |/ / | | | | | | | | | PHPBB3-13221
* | | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-262-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 membersJakub Senko2014-10-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13193
| * | | [ticket/13193] Make template more readableJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13193
| * | | [ticket/13193] Add load_search config checkJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13193
| * | | [ticket/13193] Add link to post count in PMsJakub Senko2014-10-212-1/+2
| | | | | | | | | | | | | | | | PHPBB3-13193
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 06:15:07 +0000