Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | * 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 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-13271 | ||||
* | | [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] 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 | ||||
* | | [ticket/13268] Properly append ternary result in get_existing_indexes() | Patrick Webster | 2014-11-01 | 1 | -2/+2 |
|/ | | | | PHPBB3-13268 | ||||
* | 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 'naderman-ticket/13232' into prep-release-3.1.0 | Joas Schilling | 2014-10-28 | 3 | -3/+4 |
|\ \ | |/ |/| | |||||
| * | [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 | 1 | -1/+2 |
| | | | | | | | | PHPBB3-13232 | ||||
* | | 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 | ||||
* | | [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 | ||||
* | [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 | ||||
* | [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 | ||||
* | [prep-release-3.1.0] Add 3.1.0 gold release migration | Nils Adermann | 2014-10-25 | 1 | -0/+31 |
| | |||||
* | Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0 | Nils Adermann | 2014-10-25 | 7 | -33/+325 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '078e0c1e440f7f906b670348e8da00141e245876': [ticket/13211] Move console migrator output handler back to console folder [ticket/13211] Also use log wrapper output handler for console migrations [ticket/13211] Move console migrator output handler to db folder [ticket/13211] Add log wrapper for writing database updater to log file [ticket/13126] Add missing use statement [ticket/13126] Fix tests [ticket/13126] Change messages verbosity levels [ticket/13126] Move migrator_output_handler to an interface [ticket/13126] Extends migrator_output_handler instead of using a closure [ticket/13126] Improve the feedback when running the migrations | ||||
| * | [ticket/13211] Move console migrator output handler back to console folder | Marc Alexander | 2014-10-25 | 2 | -2/+3 |
| | | | | | | | | PHPBB3-13211 | ||||
| * | [ticket/13211] Also use log wrapper output handler for console migrations | Marc Alexander | 2014-10-25 | 2 | -9/+13 |
| | | | | | | | | PHPBB3-13211 | ||||
| * | [ticket/13211] Move console migrator output handler to db folder | Marc Alexander | 2014-10-24 | 2 | -3/+2 |
| | | | | | | | | PHPBB3-13211 | ||||
| * | [ticket/13211] Add log wrapper for writing database updater to log file | Marc Alexander | 2014-10-24 | 1 | -0/+95 |
| | | | | | | | | PHPBB3-13211 | ||||
| * | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 | Marc Alexander | 2014-10-24 | 6 | -32/+225 |
| |\ | |||||
| | * | [ticket/13126] Add missing use statement | Tristan Darricau | 2014-10-22 | 1 | -0/+1 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
| | * | [ticket/13126] Fix tests | Tristan Darricau | 2014-10-20 | 3 | -12/+11 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
| | * | [ticket/13126] Change messages verbosity levels | Tristan Darricau | 2014-10-20 | 3 | -7/+7 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
| | * | [ticket/13126] Move migrator_output_handler to an interface | Tristan Darricau | 2014-10-20 | 4 | -17/+33 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
| | * | [ticket/13126] Extends migrator_output_handler instead of using a closure | Tristan Darricau | 2014-10-16 | 4 | -45/+124 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
| | * | [ticket/13126] Improve the feedback when running the migrations | Tristan Darricau | 2014-10-14 | 3 | -32/+130 |
| | | | | | | | | | | | | PHPBB3-13126 | ||||
* | | | [ticket/13210] Use the correct config value | Oliver Schramm | 2014-10-25 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-13210 | ||||
* | | [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 | Joas Schilling | 2014-10-23 | 1 | -0/+31 |
| | | |||||
* | | [ticket/13203] Use string_compare method in passwords drivers | Marc Alexander | 2014-10-22 | 10 | -12/+17 |
| | | | | | | | | PHPBB3-13203 | ||||
* | | [ticket/13203] Add method for byte by byte comparison to drivers helper | Marc Alexander | 2014-10-22 | 1 | -0/+20 |
| | | | | | | | | PHPBB3-13203 | ||||
* | | Merge pull request #3040 from nickvergessen/ticket/13138-asc | Joas Schilling | 2014-10-20 | 1 | -9/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | [3.1] Ticket/13138 Only use cookie data when we do not force a user_id Conflicts: phpBB/phpbb/session.php | ||||
| * | | Merge branch 'ticket/13138-2' into ticket/13138-asc | Joas Schilling | 2014-10-16 | 1 | -26/+29 |
| | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php | ||||
* | | | Merge pull request #3048 from naderman/ticket/13188 | Nils Adermann | 2014-10-20 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index |