aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-9/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3724 from javiexin/ticket/13960Tristan Darricau2015-10-081-9/+6
| |\ \ \ \ \
| | * | | | | [ticket/13960] Profile field validation breaks ACPjaviexin2015-06-231-9/+6
* | | | | | | [ticket/14222] Use request class instead of request_var in acp_usersMarc Alexander2015-10-081-1/+1
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-072-6/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3440 from CHItA/ticket/13636Marc Alexander2015-10-072-6/+22
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/13636] Fix coding styleMateBartus2015-04-061-3/+3
| | * | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-9/+10
| | * | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-6/+21
* | | | | | | Merge pull request #3871 from Zoddo/ticket/10165Marc Alexander2015-10-071-0/+29
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10165] Add a "Send test email" featureZoddo2015-09-091-0/+29
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [ticket/14205] Bump PHP requirement to PHP 5.4Tristan Darricau2015-10-041-1/+1
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-161-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | [ticket/14154] Add extension composer name as tooltipZoddo2015-09-121-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+5
| * | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+5
| | |_|/ | |/| |
* | | | [ticket/12505] Remove outdated media handling from acpn-aleha2015-08-241-6/+0
* | | | [ticket/12143] Oops, fixed array indexOliver Schramm2015-08-051-1/+1
* | | | [ticket/12143] Replace group name outputOliver Schramm2015-08-055-29/+51
* | | | Merge branch '3.1.x'Marc Alexander2015-07-221-2/+74
|\ \ \ \ | |/ / /
| * | | Merge pull request #3719 from javiexin/ticket/13911Marc Alexander2015-07-221-2/+74
| |\ \ \
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-271-3/+3
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-041-5/+5
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-3/+26