aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
Commit message (Collapse)AuthorAgeFilesLines
* [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-0660-727/+965
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 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/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
| * | | [ticket/10631] Fixing up the templateMichael Cullum2012-09-011-32/+32
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | [ticket/10631] A few more extension admin changesMichael Cullum2012-09-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | [ticket/10631] Fixing some items mentioned in PRMichael Cullum2012-09-015-13/+9
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | [ticket/10631] Changing Ext Admin List to conform to standardsMichael Cullum2012-09-011-4/+8
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | [ticket/10631] Add an extension details pageMichael Cullum2012-09-011-0/+97
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | [ticket/10631] Adding an extensions adminMichael Cullum2012-09-015-0/+168
| | | | | | | | | | | | | | | | PHPBB3-10631
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| | * | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
| * | | [ticket/11008] Remove eval() calls to get document[id]Igor Wiedler2012-07-211-5/+1
| | | | | | | | | | | | | | | | PHPBB3-11008
| * | | Merge pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-193-9/+31
| |\ \ \ | | | | | | | | | | Feature/new tz handling
| | * \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-181-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | feature/new-tz-handling
| | * | | [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicatesJoas Schilling2012-06-192-33/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| | * | | [feature/new-tz-handling] Add doc blocks to js functionsJoas Schilling2012-06-181-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| | * | | [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascriptJoas Schilling2012-06-182-17/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| | * | | [feature/new-tz-handling] Fix timezone option when editing a user in the ACPJoas Schilling2012-06-183-4/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| | * | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-5/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| | | * | | [feature/new-tz-handling] Removed DST options from templates.Oleg Pudeyev2012-03-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-188-100/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
| * | | | | [ticket/10968] Render pagination within the templateDrae2012-07-187-25/+123
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since phpBB 2 pagination has been rendered mostly within the source. This limits just what designers can do with pagination. The current form is also questionable in terms of "best practice". The aim is to move rendering completely to the template via the use of a block element. Enabling S_ template vars also allows for control over specific aspects of the pagination output such as next, previous, active and ellipsis. Related to this - merging the capabilities of the topic_generate_pagination with generate_pagination removes an element of duplication. PHPBB3-10968
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-011-3/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| * develop-olympus: [ticket/10773] ACP logo with registered trademark symbol
| | * | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-301-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10773
| * | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-291-14/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| | * | [ticket/10308] fixes indentationDhruv Goel2012-05-111-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | indentation is fixed and user_posts variable is compared as a boolean variable. PHPBB3-10308
| | * | [ticket/10308] fixes language variable nameDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Language variable has be renamed for better understanding PHPBB3-10308
| | * | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of fetching all posts by user we limit the query to 1 to check if a user has posts or not PHPBB3-10308
| | * | [ticket/10308] fixes user deletion if no postsDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | introduces a hidden input field with retain posts as the mode in case user has no posts. PHPBB3-10308
| | * | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | language key renamed to make its usability more clearer. PHPBB3-10308