aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-10-253-9/+45
|\ | | | | | | | | | | | | * develop-ascraeus: [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 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 'develop-ascraeus' into developNils Adermann2014-10-250-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13215] Update Symfony components to v2.3.21. Conflicts: phpBB/composer.lock
| * | 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 'develop-ascraeus' into developNils Adermann2014-10-250-0/+0
|\ \ \ | |/ / | | | | | | * develop-ascraeus:
| * | 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 branch 'develop-ascraeus' into developNils Adermann2014-10-2510-57/+332
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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 'develop-ascraeus' into developAndreas Fischer2014-10-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13210] Use the correct config value
| * | | | 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 'develop-ascraeus' into developAndreas Fischer2014-10-253-36/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | 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 'develop-ascraeus' into developJoas Schilling2014-10-235-37/+105
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | 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 branch 'develop-ascraeus' into developJoas Schilling2014-10-231-5/+14
|\ \ \ | |/ /
| * | Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
| |\ \ | | | | | | | | | | | | [ticket/security-161] Add form token to styles management form.
| | * | [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
| | | | | | | | | | | | | | | | SECURITY-161
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-224-1/+44
|\ \ \ \ | |/ / /
| * | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-224-1/+44
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders
| | * | | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| | * | | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13205
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 07:41:03 +0000