aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-161-0/+1
|\ | | | | | | | | * develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
| * Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympusOleg Pudeyev2012-03-161-0/+1
| |\ | | | | | | | | | | | | * nickvergessen/ticket/8636: [ticket/8636] Add resync option to topic_view moderation page
| | * [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-231-0/+1
| | | | | | | | | | | | PHPBB3-8636
* | | [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queueJoas Schilling2012-03-141-1/+1
| | | | | | | | | | | | PHPBB3-10690
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-254-3/+4
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10456] Add tabindex to subsilver2 captcha
| * | [ticket/10456] Add tabindex to subsilver2 captchaJoas Schilling2012-02-214-3/+4
| |/ | | | | | | | | | | Did not set tabindex on registration page, as the hole page does not have any. PHPBB3-10456
* | [ticket/10641] Update MCP template with new plurality formsPatrick Webster2012-02-111-18/+0
| | | | | | | | | | | | Updates the MCP template according to PHPBB3-10345 PHPBB3-10641
* | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-101-2/+2
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| * Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-101-2/+2
| |\ | | | | | | | | | | | | | | | * cyberalien/ticket/10569: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| | * [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
| | | | | | | | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in subsilver2 PHPBB3-10569
* | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-071-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| * | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-031-0/+4
| |/ | | | | | | | | | | Adding template inheritance field to prosilver and subsilver2 PHPBB3-10616
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-032-10/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Forgot a subsilver2 change. *doh*David King2011-12-151-6/+0
| | | | | | | | | | | | PHPBB3-10535
| * | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-151-4/+0
| | | | | | | | | | | | PHPBB3-10535
* | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
| | | | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
| * | [ticket/10542] Remove class="postlink" in subsilver2 faq_body.htmlRichard Foote2011-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | class="postlink" is not defined in stylesheet.css so remove it from styles/subsilver2/template/faq_body.html PHPBB3-10542
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-49/+47
|\ \ \ | |/ / | | / | |/ |/| | | * develop-olympus: [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
| * [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-151-49/+47
| | | | | | | | | | | | | | | | Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp" This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc. PHPBB3-8996
| * [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-201-1/+1
| |
* | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-203-6/+6
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/10344: [ticket/10344] Add attachment icons to list of reported and queued posts/topics
| * | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-273-6/+6
| | | | | | | | | | | | PHPBB3-10344
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-47/+49
|\ \ \ | | |/ | |/| | | | | | | | | | * develop-olympus: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
| * | Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympusOleg Pudeyev2011-11-191-47/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8996: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
| | * | [ticket/8996] Also fix the BBCode bug in subsilver2 and acpJoas Schilling2011-11-181-47/+49
| | | |
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10452] Fix xHTML errors when print-viewing PMs Conflicts: phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
| * | | [ticket/10452] Fix xHTML errors when print-viewing PMsJoas Schilling2011-11-141-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Also changed the layout of prosilvers PM print-view, so it looks like the post print-view and not like the subsilver2 print-view. PHPBB3-10452
* | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-262-2/+4
| | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'github-cyberalien/feature/remove-imagesets' ↵Nils Adermann2011-09-2019-55/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0419-55/+57
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Changing subsilver PHPBB3-10336
* | | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-052-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-174-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-52/+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-231-52/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9474
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-291-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * 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-291-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10341
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-271-4/+7
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * 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-271-4/+7
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 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-301-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 developNils Adermann2011-08-181-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-181-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8571
* | | | | | Merge remote-tracking branch 'erikfrerejean/ticket/10312' into developAndreas Fischer2011-08-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-071-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
| * | | | | Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympusOleg Pudeyev2011-08-071-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10298: [ticket/10298] Properly close embed tag for QuickTime in subsilver2.