aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | [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 branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-272-1/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-272-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-271-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-273-4/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | 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
| |/ / /
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-261-0/+2
|\ \ \ \ | |/ / /
| * | | [prep-release-3.1.0] Update CHANGELOG with last minute changesNils Adermann2014-10-261-0/+2
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-261-1/+1
|\ \ \ \ | |/ / /
| * | | 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 branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-264-122/+151
|\ \ \ \ | |/ / /
| * | | 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
| |/ / /
* | | | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-262-1/+2
|\ \ \ \
| * | | | [ticket/13193] Swap ternary condition membersJakub Senko2014-10-261-1/+1
| * | | | [ticket/13193] Make template more readableJakub Senko2014-10-211-1/+1
| * | | | [ticket/13193] Add load_search config checkJakub Senko2014-10-211-1/+1
| * | | | [ticket/13193] Add link to post count in PMsJakub Senko2014-10-212-1/+2
* | | | | Merge pull request #3067 from marc1706/ticket/13216Nils Adermann2014-10-251-14/+14
|\ \ \ \ \
| * | | | | [ticket/13216] Use gmdate() instead of date() in datetime testsMarc Alexander2014-10-251-14/+14
* | | | | | Merge remote-tracking branch 'github-marc1706/ticket/13207' into develop-ascr...Nils Adermann2014-10-251-3/+2
|\ \ \ \ \ \
| * | | | | | [ticket/13207] Use assert_checkbox_is_checked for registration testMarc Alexander2014-10-251-3/+2
| |/ / / / /
* | | | | | [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] 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
| |/ / / / |/| | | |