aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-133-14/+17
|\
| * [3.1.x] Increase dev version for 3.1.9Joas Schilling2016-02-131-1/+1
| * Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-132-4/+4
| |\
| | * [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-132-4/+4
| * | Merge pull request #4177 from marc1706/ticket/14475Joas Schilling2016-02-131-10/+13
| |\ \
| | * | [ticket/14475] Do not log removal of users from newly registered groupMarc Alexander2016-02-131-10/+13
| | |/
| * | [prep-release-3.1.8] Update version to 3.1.8-RC1Joas Schilling2016-02-131-1/+1
| |/
| * Merge pull request #4141 from exussum12/ticket/14431-3.1Marc Alexander2016-02-031-2/+11
| |\
| | * [ticket/14430] Remote avatar uploadingScott Dutton2016-02-031-17/+1
| | * [ticket/14431] Remote avatar uploadingScott Dutton2016-01-251-3/+28
* | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-111-0/+1
|\ \ \
| * | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-041-0/+1
* | | | [release-3.2.0-b1] Update version to 3.2.0-b2-devTristan Darricau2016-02-051-1/+1
* | | | [prep-release-3.2.0-b1] Update version to 3.2.0-b1Tristan Darricau2016-02-031-1/+1
|/ / /
* | | [ticket/14444] Fix fatal error in functions_messenger.phpTristan Darricau2016-02-021-1/+1
* | | Merge branch '3.1.x'Marc Alexander2016-01-311-2/+6
|\ \ \ | |/ /
| * | [ticket/14439] Do not call avatar manager if avatars are disabledrxu2016-01-311-2/+6
* | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-1/+3
* | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-0/+1
* | | Merge branch '3.1.x'Marc Alexander2016-01-211-1/+1
|\ \ \ | |/ /
| * | [ticket/14423] Display database size for Aria storage enginelavigor2016-01-201-1/+1
* | | Merge branch '3.1.x'Marc Alexander2016-01-161-2/+2
|\ \ \ | |/ /
| * | Merge pull request #4122 from lavigor/ticket/12441Marc Alexander2016-01-161-2/+2
| |\ \
| | * | [ticket/12441] Correct database size detection in MariaDB 10lavigor2016-01-141-2/+2
* | | | Merge branch '3.1.x'Marc Alexander2016-01-164-10/+10
|\ \ \ \ | |/ / /
| * | | [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-154-10/+10
| |/ /
* | | Merge pull request #4077 from Nicofuma/ticket/14306Marc Alexander2016-01-151-1/+3
|\ \ \
| * | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-1/+3
* | | | Merge branch '3.1.x'Marc Alexander2016-01-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3929 from kilianr/ticket/12618Marc Alexander2016-01-121-1/+1
| |\ \ \
| | * | | [ticket/12618] Minor fix: Don't cast bool to int anymoreKilian2015-09-291-1/+1
| | * | | [ticket/12618] Allow extension author to use SSL for version-checkKilian2015-09-251-1/+1
* | | | | Merge branch '3.1.x'Joas Schilling2016-01-092-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-092-2/+6
| |\ \ \ \
| | * | | | [prep-release-3.1.7] Update version to 3.1.7-pl1Joas Schilling2016-01-091-1/+1
| | * | | | Merge pull request #24 from phpbb/ticket/security-188Joas Schilling2016-01-092-2/+6
| | |\ \ \ \
| | | * | | | [ticket/security-188] Remove unused form key from acp_extensionsMarc Alexander2015-12-231-2/+0
| | | * | | | [ticket/security-188] Check form key in acp_bbcodesMarc Alexander2015-12-231-0/+6
| | * | | | | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-091-1/+1
| | * | | | | [prep-release-3.1.7] Increase version to 3.1.7Joas Schilling2015-12-191-1/+1
* | | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0974-362/+195
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-064-2/+9
| * | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-0611-18/+9
| * | | | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0627-117/+54
| * | | | | | [ticket/13454] Fix code sniffer complaintsMarc Alexander2016-01-062-2/+2
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0626-65/+37
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-065-5/+4
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0627-69/+29
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0654-104/+71