aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* [prep-release-3.1.0] Update CHANGELOG with last minute changesNils Adermann2014-10-261-0/+2
|
* 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 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
* [prep-release-3.1.0] Add missing CHANGELOG entries for RC6Nils Adermann2014-10-251-0/+2
|
* [prep-release-3.1.0] Add CHANGELOG for 3.1.0Nils Adermann2014-10-251-0/+16
|
* [prep-release-3.1.0] Add 3.1.0 gold release migrationNils Adermann2014-10-251-0/+31
|
* Merge remote-tracking branch 'github-marc1706/ticket/13207' into ↵Nils Adermann2014-10-253-9/+45
|\ | | | | | | | | | | | | | | | | prep-release-3.1.0 * github-marc1706/ticket/13207: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
| * [ticket/13207] Add notification manager mock to user_add method in testsMarc Alexander2014-10-251-6/+4
| | | | | | | | PHPBB3-13207
| * [ticket/13207] Move default user notifications settings to user_add()Marc Alexander2014-10-252-14/+18
| | | | | | | | PHPBB3-13207
| * [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-253-4/+38
| | | | | | | | PHPBB3-13207
| * Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-75/+76
| |\ | |/ |/| | | | | * prep-release-3.1.0: [ticket/13215] Update Symfony components to v2.3.21.
* | Merge pull request #3062 from bantu/ticket/13215Nils Adermann2014-10-251-75/+76
|\ \ | | | | | | [ticket/13215] Update Symfony components to v2.3.21.
| * | [ticket/13215] Update Symfony components to v2.3.21.Andreas Fischer2014-10-251-75/+76
|/ / | | | | | | PHPBB3-13215
| * Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-250-0/+0
| |\ | |/ |/| | | * prep-release-3.1.0:
* | Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0Nils Adermann2014-10-2510-57/+332
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #3060 from marc1706/ticket/13211Nils Adermann2014-10-2510-57/+332
| | |\ | | |/ | |/| [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-253-9/+14
| | | | | | | | | | | | 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-242-1/+96
| | | | | | | | | | | | PHPBB3-13211
| * | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211Marc Alexander2014-10-248-56/+231
| |\ \
| | * | [ticket/13126] Add missing use statementTristan Darricau2014-10-221-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13126
| | * | [ticket/13126] Fix testsTristan Darricau2014-10-203-12/+11
| | | | | | | | | | | | | | | | PHPBB3-13126
| | * | [ticket/13126] Change messages verbosity levelsTristan Darricau2014-10-203-7/+7
| | | | | | | | | | | | | | | | PHPBB3-13126
| | * | [ticket/13126] Move migrator_output_handler to an interfaceTristan Darricau2014-10-204-17/+33
| | | | | | | | | | | | | | | | PHPBB3-13126
| | * | [ticket/13126] Extends migrator_output_handler instead of using a closureTristan Darricau2014-10-165-57/+125
| | | | | | | | | | | | | | | | PHPBB3-13126
| | * | [ticket/13126] Improve the feedback when running the migrationsTristan Darricau2014-10-145-56/+147
| | | | | | | | | | | | | | | | PHPBB3-13126
| | | * Merge branch 'prep-release-3.1.0' into develop-ascraeusAndreas Fischer2014-10-251-1/+1
| | | |\ | |_|_|/ |/| | | | | | | | | | | * prep-release-3.1.0: [ticket/13210] Use the correct config value
* | | | Merge pull request #3061 from Elsensee/ticket/13210Andreas Fischer2014-10-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13210] Use the correct config value * Elsensee/ticket/13210: [ticket/13210] Use the correct config value
| * | | | [ticket/13210] Use the correct config valueOliver Schramm2014-10-251-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13210
| | | * Merge branch 'prep-release-3.1.0' into develop-ascraeusAndreas Fischer2014-10-258-43/+46
| | | |\ | | |/ / | |/| / | |_|/ |/| | | | | | | | * prep-release-3.1.0: [ticket/13208] Add security issues to the final changelog [prep-release-3.1.0] Prepare Changelog [prep-release-3.1.0] Update version to 3.1.0
* | | Merge pull request #3059 from nickvergessen/ticket/13208Marc Alexander2014-10-231-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13208] Add security issues to the final changelog
| * | | [ticket/13208] Add security issues to the final changelogJoas Schilling2014-10-231-1/+1
| |/ / | | | | | | | | | PHPBB3-13208
* | | [prep-release-3.1.0] Prepare ChangelogJoas Schilling2014-10-231-34/+37
| | |
* | | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-236-8/+8
|/ /
* | Merge branch 'prep-release-3.1.0-RC6' into develop-ascraeusJoas Schilling2014-10-238-43/+112
|\ \
| * | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-233-5/+5
| | |
| * | [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6Joas Schilling2014-10-231-0/+35
| | |
| * | [prep-release-3.1.0-RC6] Prepare ChangelogJoas Schilling2014-10-231-33/+36
| | |
| * | [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6Joas Schilling2014-10-231-0/+31
| | |
| * | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-236-8/+8
|/ /
* | Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
|\ \ | | | | | | | | | [ticket/security-161] Add form token to styles management form.