aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-11-024-7/+9
|\
| * Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-024-8/+9
| |\
| | * [ticket/13248] Always use provider collection for getting providerMarc Alexander2014-11-013-7/+8
| | * [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-011-1/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-281-2/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-2/+2
| |\ \ | | |/
| | * Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-281-2/+2
| | |\
| | | * [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasksNils Adermann2014-10-271-2/+2
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-271-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-2/+2
| |\ \ \ | | |/ /
| | * | [ticket/13229] Fix overloading memberlist with redundant SQL queriesrxu2014-10-271-2/+2
| | |/
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-271-2/+5
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-2/+5
| |\ \ | | |/
| | * [ticket/13230] Add missing globals and missing request object for path helperJoas Schilling2014-10-271-2/+5
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-261-0/+1
|\ \ \ | |/ /
| * | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-261-0/+1
| |\ \
| | * | [ticket/13193] Swap ternary condition membersJakub Senko2014-10-261-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-211-0/+1
| * | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-251-1/+1
| | |/ | |/|
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-1/+27
|\ \ \ | |/ /
| * | [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-252-2/+24
| * | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-231-1/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-1/+0
|\ \ \ | |/ /
| * | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-231-1/+1
| * | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-231-1/+1
* | | 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-222-1/+41
|\ \ \ \ | |/ / /
| * | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-222-1/+41
| |\ \ \
| | * | | [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-222-1/+42
* | | | | 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 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 developNils Adermann2014-10-211-24/+14
|\ \ \ \ | |/ / /
| * | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+14
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-201-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
| |\ \ \
| | * \ \ Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| | |\ \ \
| | | * | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | * | | | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
| | |/ / /
| | * | | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-061-2/+14
| | |\ \ \
| | | * | | [ticket/11224] Remove new line in acm_memory.phpTristan Darricau2014-05-151-1/+1
| | | * | | [ticket/11224] Fix coding styleTristan Darricau2014-05-151-2/+2