aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge pull request #3067 from marc1706/ticket/13216Nils Adermann2014-10-251-14/+14
|\ \ \ | | | | | | | | [ticket/13216] Use gmdate() instead of date() in datetime tests
| * | | [ticket/13216] Use gmdate() instead of date() in datetime testsMarc Alexander2014-10-251-14/+14
| | | | | | | | | | | | | | | | PHPBB3-13216
* | | | Merge remote-tracking branch 'github-marc1706/ticket/13207' into ↵Nils Adermann2014-10-251-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/13207: [ticket/13207] Use assert_checkbox_is_checked for registration test
| * | | | [ticket/13207] Use assert_checkbox_is_checked for registration testMarc Alexander2014-10-251-3/+2
| |/ / / | | | | | | | | | | | | PHPBB3-13207
* | | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-253-5/+5
|/ / /
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-0/+2
|\ \ \ | | |/ | |/| | | | | | | * prep-release-3.1.0: [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
| * | [prep-release-3.1.0] Add missing CHANGELOG entries for RC6Nils Adermann2014-10-251-0/+2
| | |
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-0/+16
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.1.0: [prep-release-3.1.0] Add CHANGELOG for 3.1.0
| * | [prep-release-3.1.0] Add CHANGELOG for 3.1.0Nils Adermann2014-10-251-0/+16
| | |
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-0/+31
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.1.0: [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 branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-253-9/+45
|\ \ \ | |/ / | | | | | | | | | | | | | | | * prep-release-3.1.0: [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
| * | 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
|/ / /