aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
|\
| * [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2Tristan Darricau2014-10-280-0/+0
| |\
| | * [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| * | [ticket/13234-2] Correctly verify that user_id is set in user data arrayNils Adermann2014-10-271-2/+2
| * | [ticket/13234-2] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-29/+38
| * | Merge branch 'ticket/13234' into ticket/13234-2Nils Adermann2014-10-270-0/+0
| |\ \ | | |/
| | * [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
* | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-285-7/+8
|\ \ \ | |/ / |/| |
| * | [ticket/13232] Fix spaces vs tabsJoas Schilling2014-10-281-2/+2
| * | [ticket/13232] Ensure prune cron job always gets run in prune testNils Adermann2014-10-271-2/+2
| * | Merge pull request #4 from nickvergessen/naderman-ticket/13232Nils Adermann2014-10-272-3/+3
| |\ \
| | * | [ticket/13232] Fix more issues with TTL and global cache fileJoas Schilling2014-10-282-3/+3
| |/ /
| * | [ticket/13232] Fix indentationNils Adermann2014-10-271-2/+2
| * | [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasksNils Adermann2014-10-272-3/+4
* | | Merge pull request #3085 from naderman/ticket/13227Nils Adermann2014-10-271-1/+17
|\ \ \
| * | | [ticket/13227] Properly handle curlwrapper headers in remote avatarsNils Adermann2014-10-271-1/+17
* | | | Merge pull request #3083 from Nicofuma/ticket/13231Nils Adermann2014-10-271-0/+5
|\ \ \ \
| * | | | [ticket/13231] Update the dependencies of the migration contact_admin_formTristan Darricau2014-10-271-0/+5
* | | | | Merge branch 'ticket/13229' into prep-release-3.1.0Nils Adermann2014-10-272-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/13229] Fix overloading memberlist with redundant SQL queriesrxu2014-10-272-3/+3
|/ / / /
* | | | Merge pull request #3077 from marc1706/ticket/13225Joas Schilling2014-10-271-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1Marc Alexander2014-10-271-1/+1
| * | | [ticket/13225] Use passwords manager instead of phpbb_hash in migrationMarc Alexander2014-10-261-1/+4
| |/ /
* | | Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release...Nils Adermann2014-10-272-2/+30
|\ \ \
| * | | [ticket/13226] Add functional test for group ranksTristan Darricau2014-10-271-0/+28
| * | | [ticket/13226] Fix the usage of $rank_imgTristan Darricau2014-10-271-2/+2
| |/ /
* | | Merge pull request #3079 from nickvergessen/ticket/13230Nils Adermann2014-10-271-2/+5
|\ \ \ | |/ / |/| |
| * | [ticket/13230] Add missing globals and missing request object for path helperJoas Schilling2014-10-271-2/+5
|/ /
* | [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] Fix USERNAME email template variable in notificationrxu2014-10-261-1/+1
|/ /
* | Merge pull request #3073 from nickvergessen/ticket/13221Nils Adermann2014-10-264-122/+151
|\ \
| * | [ticket/13221] Add bot_update as a dependency to goldJoas Schilling2014-10-261-0/+1
| * | [ticket/13221] Perform bot updates after user table changesJoas Schilling2014-10-263-122/+150
|/ /
* | [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 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