aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils 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 'develop-ascraeus' into developAndreas 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 'develop-ascraeus' into developAndreas Fischer2014-10-252-35/+38
|\ \ \ \ | |/ / /
| * | | [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-235-7/+7
| |/ /
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-234-35/+103
|\ \ \ | |/ /
| * | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-232-2/+2
| * | [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-235-7/+7
* | | 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.Cesar G2014-10-221-5/+14
* | | | 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] 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 branch 'develop-ascraeus' into developNils Adermann2014-10-221-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-2212-12/+38
|\ \ \ \ | |/ / /
| * | | [ticket/13203] Use string_compare method in passwords driversMarc Alexander2014-10-2211-12/+18
| * | | [ticket/13203] Add method for byte by byte comparison to drivers helperMarc Alexander2014-10-221-0/+20
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-10-211-1/+1
| |\ \ \
| | * | | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3053 from Senky/ticket/13194Marc Alexander2014-10-211-1/+1
| |\ \ \ \
| | * | | | [ticket/13194] Use correct array to access bbcode_bitfieldJakub Senko2014-10-211-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-32/+44
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3052 from VSEphpbb/ticket/13041Marc Alexander2014-10-211-32/+44
| |\ \ \ \
| | * | | | [ticket/13041] Final grammar and language changes to help_faqMatt Friedman2014-10-211-9/+9
| | * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-181-9/+9
| | * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-111-2/+2
| | * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-081-21/+25