aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
Commit message (Collapse)AuthorAgeFilesLines
* [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 '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
* | | | | 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
| | * | | | | [ticket/11103] Remove title attribute from notification linkMatt Friedman2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Restore new/unread messages info/link in header (properly)Nathan Guse2013-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Add Notification Settings link in flyout menuNathan Guse2013-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Restore new/unread messages info/link in headerNathan Guse2013-02-151-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | [ticket/11103] Mark/Unmark All buttonsNathaniel Guse2013-02-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-111-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (28) and others # Via Andreas Fischer (9) and others * 'develop' of https://github.com/phpbb/phpbb3: (90 commits) [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver [feature/migrations] Remove default values from necessary parameters [ticket/11201] Revert WLM dropping because it is still used in China. [ticket/11220] Improvement to the info pop-up from "list=" [feature/migrations] Revert unrelated changes to functions.php [ticket/11233] prohibit selecting anonymous user as a PM recipient [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input. [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. [ticket/10050] removing prosilver edits [ticket/9737] Fix some comments [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. [ticket/11338] Travis CI: Install PHP extension for redis key-value store. [ticket/10050] adding .topicrow to template condition [ticket/9737] Fix a few minor things in migrations ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-1510-26/+21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| * | | | | [ticket/11103] Fix notifications link to handle non-JS fallbackMatt Friedman2013-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-092-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-6/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * \ \ \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-202-1/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml phpBB/index.php
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-1075-320/+320
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | | | | [ticket/11103] Re-add notify method to the UCP preferencesNathan Guse2012-10-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that this is used in other areas still in phpBB, so it should not be removed. PHPBB3-11103
| * | | | | | | | | [ticket/11103] Create common.js for subsilver2, move added JS code thereNathan Guse2012-10-193-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | | [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eofNathan Guse2012-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-15 14:57:20 +0000