aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-051-0/+1
|\ | | | | | | | | * develop-olympus: [ticket/10849] Added missing helptext for listitem
| * [ticket/10849] Added missing helptext for listitemgalaxyAbstractor2012-04-271-0/+1
| | | | | | | | | | | | Added the missing helptext for list item in subsilver2. PHPBB3-10849
* | Merge PR #592 branch 'develop-olympus' into developOleg Pudeyev2012-04-192-3/+3
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
| * Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympusOleg Pudeyev2012-04-192-3/+3
| |\ | | | | | | | | | | | | | | | * nickvergessen/ticket/9089: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
| | * [ticket/9089] Add tabindex to pm/topic/post icon-options aswellJoas Schilling2012-02-271-1/+1
| | | | | | | | | | | | PHPBB3-9089
| | * [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subjectJoas Schilling2012-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | I also added tabindex 1 to the buttons for adding the recipients. Also note, that duplicated tabindex are fine: http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex PHPBB3-9089
* | | [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-111-1/+1
| | | | | | | | | | | | PHPBB3-10783
* | | [ticket/10783] Added assets_version to subsilver2.Callum Macrae2012-04-111-1/+1
| | | | | | | | | | | | PHPBB3-10783
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-042-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-042-2/+2
| | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
| * | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | In opera, window.getSelection() returned incorrect values, should be using document.getSelection() instead. Fixed in prosilver and subsilver2 templates. PHPBB3-10731
* | | Merge pull request #670 from imkingdavid/feature/qrpreviewrxu2012-04-011-2/+2
|\ \ \ | | | | | | | | [feature/qrpreview] Preview from Quick Reply
| * | | [feature/qrpreview] Preview from Quick ReplyDavid King2012-03-301-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10726
* | | | Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-013-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10731] Fixed addquote() to work on opera browser. [ticket/10731] Fixed addquote() to work on opera browser. [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2 [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language [ticket/10675] Add disk full language string when posting attachments
| * | | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In opera, window.getSelection() returned incorrect values, should be using document.getSelection() instead. Fixed in prosilver and subsilver2 templates. PHPBB3-10731
| * | | | Merge remote-tracking branch 'brunoais/ticket/10705' into developDavid King2012-03-312-3/+3
| |\ \ \ \
| | * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2Bruno Ais2012-03-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with L_NO_WARNINGS PHPBB3-10705
* | | | | | [ticket/10665] INCLUDEJS template changesVjacheslav Trushkin2012-04-012-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Implementing INLCUDEJS template tag in styles PHPBB3-10665
* | | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-311-1/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | | Merge branch 'callumacrae/ticket/10510-' into developDavid King2012-03-301-1/+13
| |\ \ \ \
| | * | | | [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.Callum Macrae2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was referring to some template variables that were removed in a previous commit. Changed! PHPBB3-10510
| | * | | | [ticket/10510] Moved quick-mod tools into a loop.Callum Macrae2012-03-171-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| | * | | | [ticket/10510] Updated quick-mod conditional in subsilver2.Callum Macrae2012-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was still trying to use the old conditional, which was referring to a variable which had been removed. PHPBB3-10510
| | * | | | [ticket/10510] Moved quick-mod tools markup to template.callumacrae2012-03-041-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10510
* | | | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-293-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | | | [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopicBruno Ais2012-03-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As cyberalien requested. This was changed to match better the idea behind what was made in prosilver to subsilver2. PHPBB3-10600
| * | | | | [feature/save-post-on-report] Saves the post reported when a report is creatBruno Ais2012-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem when creating a report is that the report may be made and then the post changed. After the changes, if the report is seen the message it shows may not be correct to be reported. With these changes, when a report is created the system copies the post that was reported and shows it in the report details in the MCP PHPBB3-10600
| * | | | | 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
* | | | | [feature/merging-style-components] Removing theme.cfg and template.cfgVjacheslav Trushkin2012-03-141-27/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | Removing theme.cfg and template.cfg PHPBB3-10632
* | | | 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