aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13207] Use assert_checkbox_is_checked for registration testMarc Alexander2014-10-251-3/+2
* Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-0/+2
|\
| * [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] 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] 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
|\ \ | |/
| * Merge remote-tracking branch 'github-marc1706/ticket/13207' into prep-release...Nils Adermann2014-10-253-9/+45
| |\
| | * [ticket/13207] Add notification manager mock to user_add method in testsMarc Alexander2014-10-251-6/+4
| | * [ticket/13207] Move default user notifications settings to user_add()Marc Alexander2014-10-252-14/+18
| | * [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-253-4/+38
| |/ |/|
* | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-251-75/+76
|\ \ | |/
| * Merge pull request #3062 from bantu/ticket/13215Nils Adermann2014-10-251-75/+76
| |\
| | * [ticket/13215] Update Symfony components to v2.3.21.Andreas Fischer2014-10-251-75/+76
| |/
* | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-250-0/+0
|\ \ | |/
| * Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0Nils Adermann2014-10-2510-57/+332
| |\
* | \ Merge pull request #3060 from marc1706/ticket/13211Nils Adermann2014-10-2510-57/+332
|\ \ \ | | |/ | |/|
| * | [ticket/13211] Move console migrator output handler back to console folderMarc Alexander2014-10-252-2/+3
| * | [ticket/13211] Also use log wrapper output handler for console migrationsMarc Alexander2014-10-253-9/+14
| * | [ticket/13211] Move console migrator output handler to db folderMarc Alexander2014-10-242-3/+2
| * | [ticket/13211] Add log wrapper for writing database updater to log fileMarc Alexander2014-10-242-1/+96
| * | 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
| | * | [ticket/13126] Fix testsTristan Darricau2014-10-203-12/+11
| | * | [ticket/13126] Change messages verbosity levelsTristan Darricau2014-10-203-7/+7
| | * | [ticket/13126] Move migrator_output_handler to an interfaceTristan Darricau2014-10-204-17/+33
| | * | [ticket/13126] Extends migrator_output_handler instead of using a closureTristan Darricau2014-10-165-57/+125
| | * | [ticket/13126] Improve the feedback when running the migrationsTristan Darricau2014-10-145-56/+147
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusAndreas Fischer2014-10-251-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #3061 from Elsensee/ticket/13210Andreas Fischer2014-10-251-1/+1
| |\ \ \
| | * | | [ticket/13210] Use the correct config valueOliver Schramm2014-10-251-1/+1
| | |/ /
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusAndreas Fischer2014-10-258-43/+46
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge pull request #3059 from nickvergessen/ticket/13208Marc Alexander2014-10-231-1/+1
| |\ \
| | * | [ticket/13208] Add security issues to the final changelogJoas Schilling2014-10-231-1/+1
| |/ / |/| |
| * | [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.Cesar G2014-10-221-5/+14
* | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-224-1/+44
|\ \ \
| * | | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| * | | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| * | | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-224-1/+45
* | | | Merge pull request #3057 from marc1706/ticket/security-159Nils Adermann2014-10-221-2/+7
|\ \ \ \ | |/ / / |/| | |