aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12620] Uses a cache directory per environmentTristan Darricau2014-11-201-25/+8
* [ticket/12620] Fix download/file.php and app.php outside of the root_pathTristan Darricau2014-11-201-4/+4
* [ticket/12620] Add support of the environments for the ext routing filesTristan Darricau2014-11-201-2/+2
* [ticket/12620] Use PHPBB_ENVIRONMENTTristan Darricau2014-11-201-2/+2
* [ticket/12620] Rename productive to productionTristan Darricau2014-11-201-1/+1
* [ticket/12620] Fix functional testsTristan Darricau2014-11-201-0/+1
* [ticket/12620] Rename debug to developmentTristan Darricau2014-11-201-1/+1
* [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-201-2/+2
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-0/+2
|\
| * [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ | |/
| * [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
* | Merge pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-118-2175/+96
|\ \
| * | [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-516/+64
| * | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-081-47/+0
| * | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-088-1612/+32
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-092-3/+3
|\ \ \ | |/ / |/| / | |/
| * [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-092-3/+3
* | 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
| |\ \ \