aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
Commit message (Collapse)AuthorAgeFilesLines
* [feature/oauth] Subsilver 2 login_body updatesJoseph Warner2013-08-222-0/+10
| | | | PHPBB3-11673
* [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-131-1/+8
| | | | PHPBB3-9649
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-135-5/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * [ticket/11388] INCLUDECSSNathaniel Guse2013-07-111-0/+2
| | | | | | | | PHPBB3-11388
| * [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for coreNathan Guse2013-07-051-2/+4
| | | | | | | | | | | | Moved below overall_footer_after so events can add JS files in that event. PHPBB3-11598
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-041-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * | [feature/twig] INCLUDEJS behavior now supports local relative pathsNathaniel Guse2013-07-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because T_TEMPLATE_PATH is not always correct for js files (e.g. the inheriting style does not include these). Now we use the Twig Loader to find the correct file to link to (most specific file first, then parent styles). Also allows using @namespace convention PHPBB3-11598
| * | [feature/twig] INCLUDEJS now uses the definition classNathaniel Guse2013-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | This had to be done because, like DEFINE, setting variables to $context only affected the local file and any children, not parent templates. PHPBB3-11598
| * | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-013-3/+3
| | | | | | | | | | | | | | | | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
| * | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was: <!-- INCLUDEJS template/foo.js --> Now: <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' --> Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598
* | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-1121-347/+262
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | Merge branch 'ticket/11566' into ticket/11566-developDhruv2013-07-011-0/+8
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11566: [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha Conflicts: phpBB/report.php
| | * [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| | | | | | | | | | | | PHPBB3-11561
| | * [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| | | | | | | | | | | | PHPBB3-11566
| * | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-061-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| | * | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
| * | | [ticket/11010] dealing with dimensions problem, removing extra codeSenky2013-05-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11010
| * | | [ticket/11010] applying some of EXreaction notesSenky2013-05-203-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11010
| * | | [ticket/11010] fixing inputs types in memberlist_search.htmlSenky2013-05-201-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11010
| * | | [ticket/11010] adding type="number" to subsilver2Senky2013-05-206-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | and removing it from prosilver wher it should not be. PHPBB3-11010
| * | | [ticket/11010] Changing email and url input types in subsilver2 templatesVinny2013-05-207-11/+11
| |/ / | | | | | | | | | PHPBB3-11010
| * | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | | | | | | | | | | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
| * | [ticket/11442] Do not suggest an option on ajax confirm boxJoas Schilling2013-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Reverting commit cb13add269b78e1a9ac84a80c78557bb7695df09 Also fixing in prosilver and subsilver2 PHPBB3-11442
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-061-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| | * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-0/+8
| | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
| * | Merge remote-tracking branch 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
| |\ \ | | | | | | | | | | | | | | | | * hjpotter92/ticket/11225: [ticket/11225] Deletion of unused mcp_jumpbox.html file
| | * | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | The file/template is no longer used(as mentioned in it). PHPBB3-11225
| * | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-122-171/+95
| |\ \ \ | | |/ / | |/| | [ticket/11314] Improve readability and code cleanup in new JavaScript files
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-2613-135/+342
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| | * | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-261-145/+66
| | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| | * | | [ticket/11314] Fix issues mentioned in jshint reportMarc Alexander2013-03-261-48/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, the editor.js files are now the same file in both subsilver2, prosilver, and the acp. PHPBB3-11314
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-02-271-1/+1
| | |\ \ \
| | * | | | [ticket/11314] Fix whitespace issuesMarc Alexander2013-01-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| | * | | | [ticket/11314] Add missing "use strict" to timezone.js filesMarc Alexander2013-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | | [ticket/11461] Add template event in the footer of view topic pagesMatt Friedman2013-03-191-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-11461
| * | | | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-092-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| | * | | | [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| | * | | | [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11303
* | | | | | [ticket/9657] Add note about post being soft deleted in subsilver2Joas Schilling2013-03-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | [ticket/9657] Fix typo in subsilver2 conditionJoas Schilling2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | [ticket/9657] Fix some more subsilver2Joas Schilling2013-03-124-16/+85
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | [ticket/9657] Finish subsilver2 viewforum and viewtopicJoas Schilling2013-03-122-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | [ticket/9657] Fix softdelete for subsilver2 - part1Joas Schilling2013-03-116-5/+47
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-044-15/+198
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * \ \ \ \ Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/6723] Show info that message has been deleted before delivery
| | * | | | [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the message has been deleted before the delivery it will still show in the message history, although with an empty message. This patch will change that behavior to showing the info that it has been deleted before it was delivered in red letters. The red letters ensure that users won't mistake the info for the actual message. PHPBB3-6723
| * | | | | Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ↵Nathan Guse2013-02-282-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11103 # By Matt Friedman # Via Matt Friedman * remotes/VSE/ticket/11103-VSEphpbb: [ticket/11103] Remove padding from notifications for now. [ticket/11103] Add newlines to bottom of css file [ticket/11103] HTML encode double arrow character [ticket/11103] Update styling of UCP Notifications in subsilver2 [ticket/11103] Update styling of UCP Notifications in prosilver [ticket/11103] Update styling of subsilver2 notification modal [ticket/11103] Update styling of prosilver notification modal [ticket/11103] Remove title attribute from notification link
| | * | | | | [ticket/11103] HTML encode double arrow characterMatt Friedman2013-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | [ticket/11103] Update styling of UCP Notifications in subsilver2Matt Friedman2013-02-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | [ticket/11103] Update styling of subsilver2 notification modalMatt Friedman2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103