aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-0628-149/+498
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (799 commits) [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working ... Conflicts: phpBB/assets/javascript/core.js
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-047-33/+207
| |\ | | | | | | | | | | | | 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
| | | * Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-021-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/6723: [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/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/11368] Fix background color for PM report rows by using accessing var.
| | | * | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
| | | |/ | | | | | | | | | | | | PHPBB3-11368
| | * | [ticket/11103] Revert whitespace changesNathan Guse2013-02-281-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11103
| | * | Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ↵Nathan Guse2013-02-282-5/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Remove padding from notifications for now.Matt Friedman2013-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | [ticket/11103] HTML encode double arrow characterMatt Friedman2013-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | [ticket/11103] Update styling of UCP Notifications in prosilverMatt Friedman2013-02-141-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | [ticket/11103] Update styling of prosilver notification modalMatt Friedman2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | [ticket/11103] Remove title attribute from notification linkMatt Friedman2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-262-4/+20
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | | * \ \ Merge remote-tracking branch 'remotes/marc/ticket/11342' into developNathaniel Guse2013-02-252-4/+20
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11342: [ticket/11342] Fix "unexpected token" syntax error [ticket/11342] Mark active topics read when marking forums read
| | | | * | | [ticket/11342] Fix "unexpected token" syntax errorMarc Alexander2013-02-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11342
| | | | * | | [ticket/11342] Mark active topics read when marking forums readMarc Alexander2013-02-032-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking forums read while viewing a category will also mark the active topics inside that category read. Therefore, the active topics should also be marked read. With this patch the ajax callback "mark_forums_read" will check if the active topics id ("active_topics") exists and also mark topics read if it does. As the active topics will only be displayed in categories, which can't have any other topics, this is a proper approach. PHPBB3-11342
| | * | | | | [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-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-116-18/+29
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-1513-50/+133
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | | | | [ticket/11103-VSE] Updated notification AJAX stylingMatt Friedman2012-12-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-091-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| | * \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-17/+19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml phpBB/index.php
| | * \ \ \ \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-1418-39/+39
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/config/services.yml
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-1073-359/+363
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that this is used in other areas still in phpBB, so it should not be removed. PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Message of no notifications if you have noneNathan Guse2012-10-202-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Use e.preventDefault();Nathan Guse2012-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Return false to prevent appending # to the URLNathan Guse2012-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Hide notifications flyout on a click outside of the list.Nathan Guse2012-10-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Fix some style code I missed in prosilverNathan Guse2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Restyling notifications list for prosilverNathan Guse2012-10-162-46/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Mark read link if notification has no URL to view itNathaniel Guse2012-10-162-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other style stuff PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] If notification display is disabled, show PM Info in headerNathan Guse2012-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] Make sure notifications are marked read when clicking themNathan Guse2012-10-142-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How do we do this? If an item is unread, the URL to view that item will be the URL to mark it as read (index.php?mark_notification=$id). When the URL is visited it marks the item as read and redirects them to the correct URL for the item. If the item is read, the URL is directly to the item. Prettify the html output PHPBB-11103
| | * | | | | | | | | | [ticket/11103] Fix some language stringsNathan Guse2012-10-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newlines at end of email files PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] UCP Notification option groupingNathan Guse2012-10-131-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the ability to specify an _EXPLAIN text for the notification option PHPBB3-11103
| | * | | | | | | | | | [ticket/11103] UCP Notification ListNathan Guse2012-10-132-32/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-10-092-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/11103] ACP option to enable/disable notifications output in headerNathan Guse2012-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | | [ticket/11103] Do not abbreviate template outputNathan Guse2012-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | | [ticket/11103] Use PM Notification Preferences from Notification OptionsNathan Guse2012-09-271-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all PM Notification preferences from UCP Board Preferences PHPBB3-11103
| | * | | | | | | | | | | [ticket/11103] Fix module setup, add explanation to templateNathan Guse2012-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | | | | | | | [ticket/11103] UCP Notification Options can now be setNathan Guse2012-09-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-06 14:08:45 +0000