aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-022-2/+2
|\
| * [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-023-3/+3
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-274-6/+25
| |\
* | \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-274-8/+25
|\ \ \ | | |/ | |/|
| * | [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-031-1/+1
| * | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-012-0/+16
| * | [ticket/14272] Make sure phpbb_avatar_manager was definedMarc Alexander2015-12-032-2/+5
| * | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-1/+1
| * | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-062-4/+4
* | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-241-1/+4
* | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-161-0/+24
* | | [ticket/14315] Apply roles options format for multiple forums tooMarc Alexander2016-02-161-4/+5
* | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-161-3/+6
* | | [ticket/14315] Correctly set default values and reset valuesMarc Alexander2016-02-161-5/+3
* | | [ticket/14315] Only add role options specified for each groupMarc Alexander2016-02-161-0/+1
* | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-041-0/+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-161-1/+1
|\ \ \ | |/ /
| * | [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-151-1/+1
* | | 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
| |\ \ \
| | * \ \ 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
* | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0929-112/+55
|\ \ \ \ \ \
| * | | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-061-1/+5
| * | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-062-2/+1
| * | | | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-068-32/+4
| * | | | | | [ticket/13454] Fix code sniffer complaintsMarc Alexander2016-01-062-2/+2
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-067-13/+7
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-1/+1
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-069-19/+7
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0624-53/+39
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-071-1/+1
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-062-4/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-022-4/+2
| * | | | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-022-4/+4
| |/ / / /
* | | | | [ticket/14325] Preserve event variable BCMate Bartus2015-11-301-42/+39
* | | | | Merge branch '3.1.x'Oliver Schramm2015-11-061-12/+53
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-12/+53
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-12/+53