aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Oliver Schramm2015-11-061-12/+53
|\ | | | | | | | | Conflicts: phpBB/includes/acp/acp_captcha.php
| * Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-12/+53
| |\ | | | | | | | | | [ticket/11971] Validate "Spambot countermeasures" settings before saving
| | * [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-12/+53
| | | | | | | | | | | | PHPBB3-11971
* | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-221-1/+1
| | | | | | | | | | | | PHPBB3-14044
* | | Merge branch '3.1.x'Tristan Darricau2015-10-141-11/+20
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14159] Hide version info on ACP if we don't have the permission
| * | 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 permission * Zoddo/ticket/14159: [ticket/14159] Hide version info on ACP if we don't have the permission
| | * [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-121-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also hide a link to an unreachable module (Check phpBB version). We could have simply remove the link to the module, but if the user hasn't the permission to access to the phpBB version check module, I think that he shouldn't view any version information about phpBB. PHPBB3-14159
* | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
| | | | | | | | | | | | PHPBB3-10572
* | | Merge branch '3.1.x'Tristan Darricau2015-10-1415-34/+124
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/10572] Unguarded includes in acp files
| * | [ticket/10572] Unguarded includes in acp filesRichard McGirr2015-10-1315-36/+132
| | | | | | | | | | | | PHPBB3-10572
* | | Merge pull request #3965 from marc1706/ticket/14234Tristan Darricau2015-10-141-6/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14234] Use replacement variables instead of references in events * marc1706/ticket/14234: [ticket/14234] Fix event doc blocks [ticket/14234] Get rid of undefined variables [ticket/14234] Fix change version and remove more references [ticket/14234] Replace more references with variables [ticket/14234] Use replacement variables instead of references in events
| * | | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-121-3/+3
| | | | | | | | | | | | | | | | PHPBB3-14234
| * | | [ticket/14234] Use replacement variables instead of references in eventsMarc Alexander2015-10-121-6/+18
| | | | | | | | | | | | | | | | PHPBB3-14234
* | | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-143-7/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14168] Refactor attachment management functions into classes * marc1706/ticket/14168: (36 commits) [ticket/14168] Correctly state return type of upload and upload_attachment [ticket/14168] Use attachment manager instead of separate classes [ticket/14168] Fix docblock in manager [ticket/14168] Add more test cases for attachment manager [ticket/14168] Add new test method and more tests [ticket/14168] Fix tabs in manager and add test file [ticket/14168] Fix tests after rebase [ticket/14168] Add attachment manager service [ticket/14168] Use correct docblock [ticket/14168] Add services_attachment.yml to services.yml [ticket/14168] Minor coding style fixes [ticket/14168] Move attachment service definitions to services_attachment [ticket/14168] Improve code coverage in upload class [ticket/14168] Move image check and don't use trigger_error() [ticket/14168] Add tests for init_error() during upload [ticket/14168] Add basic test file for attachments upload [ticket/14168] Fix CS issue [ticket/14168] No longer use deprecated functions in core files [ticket/14168] Move phpbb_unlink() into attachment delete class [ticket/14168] Reset sequence before tests in delete tests ...
| * | | [ticket/14168] Use attachment manager instead of separate classesMarc Alexander2015-10-123-18/+18
| | | | | | | | | | | | | | | | PHPBB3-14168
| * | | [ticket/14168] No longer use deprecated functions in core filesMarc Alexander2015-10-093-7/+20
| | | | | | | | | | | | | | | | PHPBB3-14168
* | | | Merge remote-tracking branch 'upstream/3.1.x'Tristan Darricau2015-10-121-1/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * upstream/3.1.x: [ticket/14188] Add core.acp_styles_action_before event
| * | | Merge pull request #3922 from Senky/ticket/14188Tristan Darricau2015-10-121-1/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14188] Add core.acp_styles_action_before event * Senky/ticket/14188: [ticket/14188] Add core.acp_styles_action_before event
| | * | | [ticket/14188] Add core.acp_styles_action_before eventJakub Senko2015-09-231-1/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-14188
* | | | | [ticket/13993] Do not parse signatures as posts when editing them.Cesar G2015-10-111-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of PHPBB3-12516 changed the manual use of the message parser to using generate_text_for_storage(). The function does not support parse_message::parse()'s mode parameter, thus all the error checks on the sig are invalid. PHPBB3-13993
* | | | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-101-2/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/14157] Allow to set the alt/title attribute on post icons
| * | | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-101-2/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-14157
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14219] Add email to inactive user listing
| * | | | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-081-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14219] Add email to inactive user listing * RMcGirr83/ticket_14219: [ticket/14219] Add email to inactive user listing
| | * | | | [ticket/14219] Add email to inactive user listingRichard McGirr2015-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ACP. May help in spotting spam accounts quickly PHPBB3-14219
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-9/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13960] Profile field validation breaks ACP
| * | | | | Merge pull request #3724 from javiexin/ticket/13960Tristan Darricau2015-10-081-9/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13960] Profile field validation breaks ACP * javiexin/ticket/13960: [ticket/13960] Profile field validation breaks ACP
| | * | | | | [ticket/13960] Profile field validation breaks ACPjaviexin2015-06-231-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure new step is calculated only if no error has been identified during validation. Also, cleanup redundant code in acp_profile.php. PHPBB3-13960
* | | | | | | [ticket/14222] Use request class instead of request_var in acp_usersMarc Alexander2015-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14222
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-072-6/+22
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_users.php
| * | | | | | Merge pull request #3440 from CHItA/ticket/13636Marc Alexander2015-10-072-6/+22
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected link
| | * | | | | [ticket/13636] Fix coding styleMateBartus2015-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13636
| | * | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "referer" to "redirect" in variable names and GET params as well. PHPBB3-13636
| | * | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Success message did not provide the expected "previous page" link (acp_inactive was expected, but the link took users to acp_users) if the acp_users module was accessed by navigating from the inactive user list to acp_users and then deleting inactive user. PHPBB3-13636
* | | | | | | Merge pull request #3871 from Zoddo/ticket/10165Marc Alexander2015-10-071-0/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10165] Add a "Send test email" feature
| * | | | | | | [ticket/10165] Add a "Send test email" featureZoddo2015-09-091-0/+29
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-10165
* | | | | | | [ticket/14205] Bump PHP requirement to PHP 5.4Tristan Darricau2015-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14205
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-161-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * 3.1.x: [ticket/14154] Add extension composer name as tooltip
| * | | | | [ticket/14154] Add extension composer name as tooltipZoddo2015-09-121-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-14154
* | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| * | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the categories added by disabled extensions PHPBB3-13950
| * | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This hides the permissions of the disabled extensions PHPBB3-13950
* | | | [ticket/12505] Remove outdated media handling from acpn-aleha2015-08-241-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove outdated media handling from acp PHPBB3-12505
* | | | [ticket/12143] Oops, fixed array indexOliver Schramm2015-08-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12143
* | | | [ticket/12143] Replace group name outputOliver Schramm2015-08-055-29/+51
| | | | | | | | | | | | | | | | | | | | | | | | So now we can use translated group names for non-special groups PHPBB3-12143
* | | | Merge branch '3.1.x'Marc Alexander2015-07-221-2/+74
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_profile.php
| * | | Merge pull request #3719 from javiexin/ticket/13911Marc Alexander2015-07-221-2/+74
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13911] Add events to configure options for profile fields
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number again. PHPBB3-13911
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number and event name. PHPBB3-13911
| | * | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fix bamboo formatting errors. PHPBB3-13911
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 16:47:45 +0000