aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | [feature/events] Append "_append" to acp_simple_header_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] acp_simple_footer_end -> acp_simple_footer_afterDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Append "_append" to acp_overall_header_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Change _end suffix to _after in acp_overall_footer_endDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Append "_append" to acp_users_overview_optionsDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Fix names of events in adm/style/acp_main.htmlDavid King2012-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Append "_append" to acp_forums_normal_settingsDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Rename event_main_actions to acp_main_actionsJoas Schilling2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Adding acp prefix to acp event namesMichael Cullum2012-12-177-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Adding forums_normal_settings acp template ledgeMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Adding simple_footer_end acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Adding simple_header_head acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Add users_overview_options acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Add overall_footer_end acp template eventMichael Cullum2012-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Adding overall_header_head acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Add main_actions acp template eventMichael Cullum2012-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | [feature/events] Add main_notice ACP template eventMichael Cullum2012-12-171-0/+2
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-102-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| * | | | | | | | [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-172-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550
* | | | | | | | [ticket/11209] Clone disable moving images to allow multiple per pageJoas Schilling2012-11-161-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disable images need to be clone rather then moved, in order to allow multiple disable images per page. We do not have such a case at the moment but it will be required for the new teampage/legend ACP section. PHPBB3-11209
* | | | | | | [ticket/11198] Remove additional asterix as /** is doc-block onlyJoas Schilling2012-11-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11198
* | | | | | | [ticket/11198] Store the swapping partners in vars and simplify the logicJoas Schilling2012-11-141-39/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11198
* | | | | | | [ticket/11198] Correctly set links after an item is moved up/down with AJAXJoas Schilling2012-11-142-15/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11198
* | | | | | [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.Andreas Fischer2012-11-101-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10780
* | | | | | [ticket/10780] Replace colon usage in adm template output with {L_COLON}Nathan Guse2012-11-1052-368/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates PHPBB3-10780
* | | | | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-0665-737/+974
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| * | | | | | [ticket/11018] Fix several paginations in ACPJoas Schilling2012-10-173-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11018
| * | | | | | [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the sameJoas Schilling2012-10-171-28/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11067 PHPBB3-11018
| * | | | | | Merge PR #890 branch 'nickvergessen/ticket/10982' into developOleg Pudeyev2012-10-161-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10982: [ticket/10982] Correctly check, whether data-overlay is set [ticket/10982] Remove overlay on first up/down move of forums in ACP [ticket/10982] Allow setting dimming control overlay also as data-overlay
| | * | | | | | [ticket/10982] Remove overlay on first up/down move of forums in ACPJoas Schilling2012-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10982
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-161-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
| | * | | | | | [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amended the closing dd tag to the appropriate line: line 145 instead of 141 PHPBB3-11093
| * | | | | | | Merge remote-tracking branch 'mvinny/ticket/11139' into developAndreas Fischer2012-10-151-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11139: [ticket/11139] Adding the $phpbb_admin_path variable [ticket/11139] Fix fatal error on colour swatch window
| | * | | | | | | [ticket/11139] Adding the $phpbb_admin_path variableVinny2012-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11139
| | * | | | | | | [ticket/11139] Fix fatal error on colour swatch windowVinny2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11139
| * | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-061-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11135] Full replacement of credit link to https Conflicts: phpBB/install/convertors/convert_phpbb20.php
| | * | | | | | [ticket/11135] Full replacement of credit link to httpsVinny2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11135
| | * | | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
| * | | | | | | [ticket/10631] Adjust prefixes to be easier to understandUnknown Bliss2012-09-012-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Make failure to meet ext enable requirements clearerNathan Guse2012-09-012-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the blocks red on the details page if requirement is not met. Also changing a how the errors come up when trying to enable/disable an extension when they cannot be. PHPBB3-10631
| * | | | | | | [ticket/10631] Various front-end fixes (extensions manager)Nathan Guse2012-09-014-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Back button from details Add cancel button from actions Correct language strings PHPBB3-10631
| * | | | | | | [ticket/10631] Functional acp_extensions test, cleanupNathan Guse2012-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Use exceptions for errors. Build action list dynamically.Nathan Guse2012-09-011-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Fix some issues as noted in github comments, significantly ↵Nathan Guse2012-09-011-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified validation PHPBB3-10631
| * | | | | | | [ticket/10631] Remove references to delete extensionNathan Guse2012-09-012-30/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Make the enable/disable/purge notices more visable.Nathan Guse2012-09-013-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Validation for extensionsNathan Guse2012-09-011-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Stagger the enable/disable/purge for extensionsNathan Guse2012-09-013-81/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Fixing some more issuesNathan Guse2012-09-011-93/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | | | [ticket/10631] Various tidbits and cleanup on the acp extensions managerNathan Guse2012-09-011-64/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631