aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * [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
| * | [ticket/13225] Use passwords manager instead of phpbb_hash in migrationMarc Alexander2014-10-261-1/+4
| |/ | | | | | | PHPBB3-13225
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-261-1/+1
|\ \ | |/ | | | | | | * develop-ascraeus: [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 'develop-ascraeus' into developNils Adermann2014-10-264-122/+151
|\ \ | |/ | | | | | | | | * develop-ascraeus: [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 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 branch 'develop-ascraeus' into developNils Adermann2014-10-251-0/+31
|\ \ | |/ | | | | | | * develop-ascraeus: [prep-release-3.1.0] Add 3.1.0 gold release migration
| * [prep-release-3.1.0] Add 3.1.0 gold release migrationNils Adermann2014-10-251-0/+31
| |
| * Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0Nils Adermann2014-10-257-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
* | \ Merge branch 'develop-ascraeus' into developNils Adermann2014-10-257-33/+325
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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
| * \ \ Merge pull request #3060 from marc1706/ticket/13211Nils Adermann2014-10-257-33/+325
| |\ \ \ | | |/ / | |/| / | | |/ [ticket/13211] Add log wrapper for writing database updater to log file
| | * [ticket/13211] Move console migrator output handler back to console folderMarc Alexander2014-10-252-2/+3
| | | | | | | | | | | | PHPBB3-13211
| | * [ticket/13211] Also use log wrapper output handler for console migrationsMarc Alexander2014-10-252-9/+13
| | | | | | | | | | | | PHPBB3-13211
| | * [ticket/13211] Move console migrator output handler to db folderMarc Alexander2014-10-242-3/+2
| | | | | | | | | | | | PHPBB3-13211
| | * [ticket/13211] Add log wrapper for writing database updater to log fileMarc Alexander2014-10-241-0/+95
| | | | | | | | | | | | PHPBB3-13211
| | * Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211Marc Alexander2014-10-246-32/+225
| | |\
| | | * [ticket/13126] Add missing use statementTristan Darricau2014-10-221-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13126
| | | * [ticket/13126] Fix testsTristan Darricau2014-10-203-12/+11
| | | | | | | | | | | | | | | | PHPBB3-13126