aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-221-1/+1
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-11/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-141-10/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-121-10/+19
* | | | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-1415-34/+124
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10572] Unguarded includes in acp filesRichard McGirr2015-10-1315-36/+132
* | | | | Merge pull request #3965 from marc1706/ticket/14234Tristan Darricau2015-10-141-6/+18
|\ \ \ \ \
| * | | | | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-121-3/+3
| * | | | | [ticket/14234] Use replacement variables instead of references in eventsMarc Alexander2015-10-121-6/+18
* | | | | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-143-7/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/14168] Use attachment manager instead of separate classesMarc Alexander2015-10-123-18/+18
| * | | | | [ticket/14168] No longer use deprecated functions in core filesMarc Alexander2015-10-093-7/+20
* | | | | | Merge remote-tracking branch 'upstream/3.1.x'Tristan Darricau2015-10-121-1/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3922 from Senky/ticket/14188Tristan Darricau2015-10-121-1/+17
| |\ \ \ \ \
| | * | | | | [ticket/14188] Add core.acp_styles_action_before eventJakub Senko2015-09-231-1/+17
| | | |_|_|/ | | |/| | |
* | | | | | [ticket/13993] Do not parse signatures as posts when editing them.Cesar G2015-10-111-1/+14
* | | | | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-101-2/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-101-2/+12
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-081-0/+1
| |\ \ \ \ \
| | * | | | | [ticket/14219] Add email to inactive user listingRichard McGirr2015-10-081-0/+1