aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
|\ | | | | | | | | * develop-olympus: [ticket/7932] Fix font size in select boxes
| * Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympusAndreas Fischer2011-11-011-0/+1
| |\ | | | | | | | | | | | | * nickvergessen/ticket/7932: [ticket/7932] Fix font size in select boxes
| | * [ticket/7932] Fix font size in select boxesJoas Schilling2011-10-291-0/+1
| | | | | | | | | | | | PHPBB3-7932
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-7/+4
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10422] Invalid "if" in viewtopic_body.html
| * | [ticket/10422] Invalid "if" in viewtopic_body.htmlVjacheslav Trushkin2011-10-181-7/+4
| | | | | | | | | | | | | | | | | | Fixing incorrect "IF" in viewtopic_body.html PHPBB3-10422
* | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-204-4/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-264-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10187] XHTML fix for empty groups in UCP.
| * | | [ticket/10187] XHTML fix for empty groups in UCP.Andreas Fischer2011-10-131-1/+8
| | | | | | | | | | | | | | | | PHPBB3-10187
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-3/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * develop-olympus: [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
| * | [ticket/10408] Layout of topics/attachments list is broken in UCP and MCPJoas Schilling2011-10-132-3/+3
| |/ | | | | | | PHPBB3-10408
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into developIgor Wiedler2011-09-21182-526/+1216
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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] Remove parse_css_file option from themes.Chris Smith2011-09-202-7/+0
| | | | | | | | | | | | PHPBB3-9741
| * | [ticket/10371] Removing last mentions of imagesetVjacheslav Trushkin2011-09-201-11/+0
| | | | | | | | | | | | | | | | | | Removing last mentions of imageset PHPBB3-10371
| * | Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' ↵Nils Adermann2011-09-20180-507/+1215
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subsilverVjacheslav Trushkin2011-09-0421-55/+598
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Changing subsilver PHPBB3-10336
| | * | [feature/remove-imagesets] Changing prosilverVjacheslav Trushkin2011-09-0410-154/+617
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Changing prosilver PHPBB3-10336
| | * | [feature/remove-imagesets] Removing imageset filesVjacheslav Trushkin2011-09-036-298/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Removing imageset files PHPBB3-10336
| | * | [feature/remove-imagesets] Moving imagesVjacheslav Trushkin2011-09-03143-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Moving images PHPBB3-10336
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-171-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * develop-olympus: [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
| | * | [ticket/10324] Fixed XHTML validity error in User Notes Prosilver themegalaxyAbstractor2011-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated align and width attributes with CSS. PHPBB3-10324
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/10362' into developIgor Wiedler2011-09-144-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * VSEphpbb/ticket/10362: [ticket/10362] Revert subsilver2 changes [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors
| * | | [ticket/10362] Revert subsilver2 changesMatt Friedman2011-09-137-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If subsilver2 will remain at XHTML then we do not need to make any changes to its files. PHPBB3-10362
| * | | [ticket/10362] HTML5 Fix - Replace name attribute with id in anchorsMatt Friedman2011-09-1111-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-09-114-17/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | I removed the fix of the original ticket and rebuild it with its own css class. This also fixes the problem with the screwed up UCP Attachments page. PHPBB3-6632 PHPBB3-10360
* | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-054-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-178-4/+8
| | | | | | | | | | | | | | | | 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 remote-tracking branch 'bantu/ticket/9474' into developOleg Pudeyev2011-09-052-105/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * bantu/ticket/9474: [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
| * | | [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.Andreas Fischer2011-08-232-105/+0
| | | | | | | | | | | | | | | | PHPBB3-9474
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10339: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| | * | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10339
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-292-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| * | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ↵Joas Schilling2011-08-292-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/bantu/10341 * remotes/bantu/ticket/10341: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| | * | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10341
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-273-9/+15
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * develop-olympus: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
| |\ \ \ | | |/ / | |/| | | | | | | | | | * nickvergessen/ticket/10253: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| | * | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since IE9 IE supports textarea.selectionStart and window.getSelection. The only problem is, that the values are still incorrect. Therefore we need to ensure that it is still treated the old way, until IE fixes this completely. PHPBB3-10253
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-201-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9978] Added semicolons to JavaScript in overall_header.
| * | | Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/9978: [ticket/9978] Added semicolons to JavaScript in overall_header.
| | * | | [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semicolons have been added to the anonymous functions in the javascript in overall_header.html. This makes JSLint happier, and also makes the code easier to minify. PHPBB3-9978
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-182-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0. Conflicts: phpBB/index.php
| * | | | Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-182-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/8571: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| | * | | | [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-8571
* | | | | Merge remote-tracking branch 'erikfrerejean/ticket/10312' into developAndreas Fischer2011-08-162-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * erikfrerejean/ticket/10312: [ticket/10312] Un-check the shadow option while moving.
| * | | | | [ticket/10312] Un-check the shadow option while moving.Erik Frèrejean2011-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a shadow topic by default when moving a topic the user should have the option to do this but it shouldn't be done by default. PHPBB3-10312
* | | | | | [ticket/10316] Resolve inconsistent move topic behaviorErik Frèrejean2011-08-151-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a topic you can straight away lock it, when using proSilver this checkbox is unchecked by default. subSilver2 however has this checked. Change subSilver2 to not check the box by default and behave as proSilver does. PHPBB3-10316