aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-09-271-5/+3
|\ | | | | | | | | * develop-olympus: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
| * [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
| | | | | | | | PHPBB3-10315
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into developIgor Wiedler2011-09-211-141/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of github.com:phpbb/phpbb3: (44 commits) [ticket/10374] Remove 'custom template' cache prefix. [feature/remove-db-styles] Remove forgotten template variables. [feature/remove-db-styles] Removed style.php! [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71. [feature/remove-db-styles] Update language to reflect removal of db storage. [feature/remove-db-styles] Mark log entrys as deprecated. [feature/remove-db-styles] Add error if template/theme file is unwritable. [feature/remove-db-styles] Add schema changes sinces 3.0.x. [feature/remove-db-styles] Readd table constant for upgrades etc. [feature/remove-db-styles] Update database schemas. [feature/remove-db-styles] Remove style.php DB storage. [feature/remove-db-styles] Remove parse_css_file option from themes. [feature/remove-db-styles] Remove DB theme handling code from session. [feature/remove-db-styles] ACP has forgotten how to store themes in the DB. [feature/remove-db-styles] Missed a few template DB bits in acp_styles. [feature/remove-db-styles] Removing unused methods from acp_style. [feature/remove-db-styles] Removed database storage of style components. [ticket/10371] Removing last mentions of imageset [ticket/10370] Add function documentation for get_stacktrace(). [ticket/10370] Explain that we are not the ones hiding backtrace pieces. ...
| * | [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-201-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
| * | Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' ↵Nils Adermann2011-09-201-135/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-cyberalien/feature/remove-imagesets: [feature/remove-imagesets] Script for converting imageset to css [feature/remove-imagesets] Changing subsilver [feature/remove-imagesets] Changing prosilver [feature/remove-imagesets] Adjustments to php files [feature/remove-imagesets] Changing admin control panel styles module [feature/remove-imagesets] Changing database structure [feature/remove-imagesets] Removing imageset files [feature/remove-imagesets] Moving images
| | * | [feature/remove-imagesets] Changing admin control panel styles moduleVjacheslav Trushkin2011-09-031-135/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Changing admin control panel styles module PHPBB3-10336
* | | | [ticket/10362] HTML5 Fix - Replace name attribute with id in anchorsMatt Friedman2011-09-1137-40/+40
|/ / / | | | | | | | | | | | | | | | | | | When validating for HTML5, the name attribute is obsolete/deprecated when used in anchor tags. The ID tag should be used here instead. PHPBB3-10362
* | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-053-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-176-3/+6
| | | | | | | | | | | | PHPBB3-10155
| * | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-113-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-07-301-3/+2
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/8173] Removed some redundant code in the BBCode JavaScript.
| * | Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympusOleg Pudeyev2011-07-301-3/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8173: [ticket/8173] Removed some redundant code in the BBCode JavaScript. Conflicts: phpBB/adm/style/acp_users_signature.html
| | * | [ticket/8173] Removed some redundant code in the BBCode JavaScript.Callum Macrae2011-07-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code can be found in the ACP, when changing a user's signature: t: '{ BBCODE_T_HELP }', The code that uses it and the code that produces it were changed or removed a while ago, but this code remained. In 2c4c1f9, the accesskey for the list item button was changed to y from t, explaining the origin of the redundant code - although it wasn't being used then, either. This commit also changes the helpline code of "[*]" to y, as the access key is y, so this makes it more consistent. PHPBB3-8173
| * | | Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympusOleg Pudeyev2011-07-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10032: [ticket/10032] Fixed typos in bbcode button name.
* | \ \ \ Merge remote-tracking branch 'igorw/ticket/10258' into developAndreas Fischer2011-07-305-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10258: [ticket/10258] Add HTML5 meta charset tag
| * | | | | [ticket/10258] Add HTML5 meta charset tagIgor Wiedler2011-07-295-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows knowing the charset when saving web pages to disk. Also, this is supported by all browsers. PHPBB3-10258
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-07-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * develop-olympus: [ticket/10032] Fixed typos in bbcode button name.
| * | | | [ticket/10032] Fixed typos in bbcode button name.Callum Macrae2011-07-141-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | addlistitem was addlitsitem. PHPBB3-10032
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-251-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
| * | | [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.Callum Macrae2011-07-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | There is no space between the first radio button and "Yes", while there is a space between the second radio button and "No". This commit fixes that. PHPBB3-10292
* | | [ticket/10258] Remove the meta charset tagIgor Wiedler2011-07-125-5/+0
| | | | | | | | | | | | | | | | | | | | | The charset tag is useless, because if a charset content-type header is present it takes precedence. And phpBB always sends such a header. PHPBB3-10258
* | | [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tagsIgor Wiedler2011-07-105-10/+0
| | | | | | | | | | | | | | | | | | These meta tags are IE specific and do not validate as HTML5. PHPBB3-10258
* | | [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-095-29/+20
| |/ |/| | | | | PHPBB3-10258
* | Merge branch 'develop-olympus' into developNils Adermann2011-07-063-3/+3
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-063-3/+3
| | | | | | | | PHPBB3-9859
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-092-6/+6
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/8138] Add autocomplete="off" to acp_board and ldap settings [ticket/8138] Add autocomplete="off" to a user and forum ACP. Conflicts: phpBB/adm/index.php
| * [ticket/8138] Add autocomplete="off" to a user and forum ACP.Nils Adermann2011-06-032-6/+6
| | | | | | | | PHPBB3-8138
* | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-201-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-201-0/+4
| | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-6/+6
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
| * | [ticket/10154] Move "copy permissions from" to below "parent" on forum creationAndreas Fischer2011-05-091-6/+6
| | | | | | | | | | | | | | | | | | Move "copy permissions from" to below "parent forum" in forum creation form. PHPBB3-10154
* | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-241-0/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/rxu/attachment-management-no-reassignment: [feature/attachment-management-no-reassignment] Handle privacy and some more. [feature/attachment-management-no-reassignment] Further feature adjustments. [feature/attachment-management-no-reassignment] Fix some more errors [feature/attachment-management-no-reassignment] Fix minor flaws in the code. [feature/attachment-management-no-reassignment] Attachments management
| * | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-241-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restrict files info for PM attachments; - add an option to resync files stats if wrong; - replace post_id sorting with post type (PM/regular post) one; - some language fixes. PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-111-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add database update entry; - add files statistics checks; - improve files deletion procedure; - improve reversed order for pagination; - adjust template file; - add missing comma for orphan key in info module; - change module mode name; - fix module explanation text; - add files comments output; - change attachments per page amount from posts to topics per page value. PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-101-0/+68
| | |/ | |/| | | | | | | | | | | | | This feature allows to manage attachments in posts and PMs via ACP. PHPBB3-9721
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-0/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * develop-olympus: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| * [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-041-0/+4
| | | | | | | | | | | | | | | | | | Implement the suggestion made by Adam in the ticket, this will add an additional checkbox to the mass e-mail page. By checking this the mass e-mail shall also be send to banned users. By default banned users however are excluded from the mass e-mail. PHPBB3-9581
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-021-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| * Merge branch 'ticket/nickvergessen/9911' into develop-olympusOleg Pudeyev2011-03-021-2/+2
| |\ | | | | | | | | | | | | * ticket/nickvergessen/9911: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| | * [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.Joas Schilling2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works. PHPBB3-9911
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9915] "Length of ban:" is not displayed in ACP
| * | [ticket/9915] "Length of ban:" is not displayed in ACPJoas Schilling2011-03-011-1/+1
| |/ | | | | | | | | | | | | Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we need to go back to "value", which we had before. PHPBB3-9915
* | [ticket/10070] Fixed line endings after ticket/9549.Oleg Pudeyev2011-03-011-158/+158
| | | | | | | | PHPBB3-10070
* | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-012-0/+162
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/9549: [ticket/9549] Display users in their primary group instead of their first group [ticket/9549] Change default value of "sort legend by group name" to false. [ticket/9549] Fix displaying empty groups [ticket/9549] Fix language strings. [ticket/9549] Only add group to legend/teampage when the checkbox is checked. [ticket/9549] New method move() to move a group more than 1 up/down. [ticket/9549] Fix some minor issues with descriptions and coding-guidelines. [ticket/9549] Throw an error when the given field-name is invalid. [ticket/9549] Make the class non static and extend delete_group function. [ticket/9549] Add template changes for subsilver2. [ticket/9549] Enhance teampage and legend functionality [ticket/9549] Add the module and files for the ACP. [ticket/9549] Update database with the new config values and columns [ticket/9549] Enhance teampage functionality with a new class, group_positions. Conflicts: phpBB/install/database_update.php
| * | [ticket/9549] Only add group to legend/teampage when the checkbox is checked.Joas Schilling2011-02-171-0/+4
| | | | | | | | | | | | | | | | | | The checkbox for the teampage was also missing from the template file. PHPBB3-9549
| * | [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.Joas Schilling2011-02-161-1/+1
| | | | | | | | | | | | PHPBB3-9549
| * | [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-161-0/+158
| | | | | | | | | | | | PHPBB3-9549
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-211-0/+15
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * develop-olympus: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| * [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-081-3/+4
| | | | | | | | PHPBB3-9675
| * [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-081-0/+14
| | | | | | | | PHPBB3-9675