aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13241] Remove sleep() and change flood interval insteadJoas Schilling2014-10-291-3/+22
* [ticket/13241] Remove sleep() since the method takes care of this nowJoas Schilling2014-10-291-12/+0
* [ticket/13241] Sleep for 1 second when posting twice in the same secondJoas Schilling2014-10-292-1/+8
* [ticket/13241] Fix pagination with global announcementsJoas Schilling2014-10-291-2/+2
* [ticket/13241] Correctly ignore announcements from topics listJoas Schilling2014-10-291-2/+2
* [ticket/13241] Add a functional test for viewforum with global announcementJoas Schilling2014-10-291-0/+256
* Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-0/+10
|\
| * [prep-release-3.1.0] Update changelog with final changesJoas Schilling2014-10-281-0/+10
* | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-28/+37
|\ \ | |/
| * Merge branch 'develop-olympus' into prep-release-3.1.0Joas Schilling2014-10-280-0/+0
| |\
| | * Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\
| * | \ 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 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-285-7/+8
|\ \ \ \ | |/ / /
| * | | 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 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
|\ \ \ | |/ /