aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | [ticket/8996] Also fix the BBCode bug in subsilver2 and acpJoas Schilling2011-11-181-31/+37
| | | | |
| * | | | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-186-7/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (93 commits) [ticket/10157] Add notification to update cpfs when installing a language. [ticket/10185] Always set board startdate on conversion [ticket/10419] Reword the language strings [ticket/9361] View correct error messages when editing account information [ticket/10457] Undefined variable $request, when print-viewing PMs [ticket/10452] Fix xHTML errors when print-viewing PMs [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. [ticket/10254] Remove subsilver2 as default style on theme. [ticket/10254] Remove style names from themes and fix some informations on it. [ticket/7138] Allow simple header and footer for trigger_error() messages [ticket/9066] Disallow some database prefix to prevent same errors and problems [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10437] Do not display announcements that are waiting for approval [ticket/10087] Organize bans in acp_baninto optgroups [ticket/8616] Include old U_INBOX var for BC [ticket/10435] Remove global announcement from forums total topic count [ticket/10435] Readd local announcements to total topic count in viewforum ... Conflicts: phpBB/install/database_update.php
| | * \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2011-11-151-0/+30
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | | * | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+30
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | | | * | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+30
| | | | |/ / | | | | | | | | | | | | | | | | | | PHPBB3-10419
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-3/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| | | * | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
| | * | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-301-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-301-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on the "Users and groups" tab in the ACP, the user is able to either enter the username of the member he wants to manage or click on "Find a member" below the input field. Unfortunately, the label for the input field is also "Find a member", which leads some users to the idea that they can search for users using that input field. By changing the label to "Enter username" this should be clear to the user. PHPBB3-9778
| | * | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-203-3/+6
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| | | * | | | [ticket/10390] Revert back to escaped script tags inside document.writeMatt Friedman2011-10-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert all script tags inside a document.write back to the escaped version so they won't trip up any XML parsers. PHPBB3-10390
| | | * | | | [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallbackMatt Friedman2011-09-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML5 styles (ACP / Prosilver) do not need to use escaped javascript wrapped in an unescape function, so we can simplify it! Only subsilver2 will use the escaped version of the fallback code, because it is still XHTML. PHPBB3-10390
| | | * | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-263-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
| * | | | | | [feature/extension-manager] Add support for templates in extensions.Nils Adermann2011-09-291-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a template path provider to separate the process of locating (cached) paths in extensions from the template engine. The locator is supplied with a list of paths from the path provider. Admin templates can now be created in ext/<ext>/adm/style/ and regular templates go into ext/<ext>/styles/<style>/template/. Extension templates override regular templates. So if an extension supplies a file with a name used in phpBB, the extension's file will be used. A side-effect of this commit: Locator and Provider are now able to deal with arbitrary levels of template inheritance. So we can expose this through phpbb_template if we choose to, and allow styles to inherit from inherited styles. PHPBB3-10323
| * | | | | 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-212-144/+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-202-10/+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-054-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-114-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'naderman/ticket/10198' into develop-olympusAndreas Fischer2011-06-101-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10198: [ticket/10198] range validation for strings should limit characters not bytes [ticket/10198] validate_config_vars() improperly validates multibyte strings
| | | * | [ticket/10198] range validation for strings should limit characters not bytesNils Adermann2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10198
| | | * | [ticket/10198] validate_config_vars() improperly validates multibyte stringsrxu2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10198
| * | | | 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
| | * | | Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympusAndreas Fischer2011-06-093-7/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/8138: [ticket/8138] Add autocomplete="off" to acp_board and ldap settings [ticket/8138] Add autocomplete="off" to a user and forum ACP.
| | | * | | [ticket/8138] Add autocomplete="off" to acp_board and ldap settingsNils Adermann2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8138
| | | * | | [ticket/8138] Add autocomplete="off" to a user and forum ACP.Nils Adermann2011-06-032-6/+6
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-8138
| | * | | Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympusAndreas Fischer2011-06-061-2/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * naderman/ticket/10067: [ticket/10067] Add separator to h_radio to place options on individual lines
| | | * | [ticket/10067] Add separator to h_radio to place options on individual linesNils Adermann2011-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous mechanism for account activation resulted in two h_radio calls with identical id attributes for two elements. PHPBB3/10067
| * | | | 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