aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* 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/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-0416-9/+207
|/ | | | | | | | | | | | | Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201
* Merge branch 'develop-olympus' into developNathaniel Guse2013-01-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | # By Senky # Via Nathaniel Guse (1) and Senky (1) * develop-olympus: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| | * [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | PHPBB3-10050
| | * [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | PHPBB3-10050
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into developNathan Guse2013-01-222-21/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11329: [ticket/11329] Moving colors to colours.css
| * | | [ticket/11329] Moving colors to colours.cssVjacheslav Trushkin2013-01-212-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | Moving color values from buttons.css to colours.css PHPBB3-11329
* | | | [ticket/11328] Replace long buttons text with short textVjacheslav Trushkin2013-01-163-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Replace long buttons text with short text, like it was on images PHPBB3-11328
* | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-152-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did. PHPBB3-10786
* | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-155-82/+19
| | | | | | | | | | | | | | | | | | | | | | | | Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did. PHPBB3-10786
* | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-155-15/+85
| | | | | | | | | | | | | | | | PHPBB3-10786
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into developNathan Guse2013-01-156-64/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10431: [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/10431] Changed fonts for Linux [ticket/10431] Adjustments for IE7 [ticket/10431] Different font for iOS [ticket/10431] CSS3 buttons
| * | | [ticket/10431] Remove .left class from reply-allVjacheslav Trushkin2013-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove .left class from .reply-all button PHPBB3-10431
| * | | [ticket/10431] Remove reply-all custom cssVjacheslav Trushkin2013-01-161-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove CSS for reply-all button that is no longer used PHPBB3-10431
| * | | [ticket/10431] Adjustments for large buttonsVjacheslav Trushkin2013-01-151-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing CSS for large buttons to display better on Mac browsers. Fixing tabs. PHPBB3-10431
| * | | [ticket/10431] Changed fonts for LinuxVjacheslav Trushkin2012-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added backup fonts for Linux systems that do not have Verdana font PHPBB3-10431
| * | | [ticket/10431] Adjustments for IE7Vjacheslav Trushkin2012-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adjustments to buttons for IE7 PHPBB3-10431
| * | | [ticket/10431] Different font for iOSVjacheslav Trushkin2012-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Different font for buttons on iOS devices because Verdana looks incorrectly aligned in Safari/iOS. Also slightly changed text shadow. PHPBB3-10431
| * | | [ticket/10431] CSS3 buttonsVjacheslav Trushkin2012-11-114-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | CSS3 replacements for big buttons PHPBB3-10431
* | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-1116-207/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201
* | | | Merge PR #1178 branch 'marc1706/ticket/10949' into developOleg Pudeyev2013-01-083-30/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (2) and Callum Macrae (1) # Via Marc Alexander * marc1706/ticket/10949: [ticket/10949] Remove not needed comma [ticket/10949] Converted missing code to new JS coding guidelines [ticket/10949] Converted AJAX coding standards to new guidelines.
| * | | | [ticket/10949] Remove not needed commaMarc Alexander2013-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comma might actually cause issues in browser. Therefore remove it. PHPBB3-10949
| * | | | [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-043-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few missing semi-colons were also added where needed. PHPBB3-10949
| * | | | Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949Marc Alexander2013-01-041-15/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/assets/javascript/core.js
| | * | | | [ticket/10949] Converted AJAX coding standards to new guidelines.Callum Macrae2012-06-211-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, moved parentheses to same line and changed variable names to camel case. PHPBB3-10949
* | | | | | [ticket/11311] Include asset core.js in subsilver2 overall_footer.htmlMarc Alexander2013-01-051-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the inclusion of core.js the timezone functions will not properly work. They refer to phpbb which is defined in core.js. PHPBB3-11311
* | | | | [ticket/11302] Correctly select first timezone or selected timezoneMarc Alexander2013-01-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering, we should default to a given timezone. By selecting the first timezone by default, this is fulfilled. This doesn't happen currently, as only the "Select a timezone" selection appears. If a user selects a timezone during the registration process we should also make sure that the selected element is still selected; even if we have to return to the registration page, i.e. if there was an error while submitting the form. This is currently not the case. With this patch the javascript code will behave correctly. Additionally, a duplicate inclusion of timezone.js has been removed as it was not needed. PHPBB3-11302
* | | | | Merge PR #1148 branch 'imkingdavid/feature/events' into developOleg Pudeyev2012-12-2017-10/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/feature/events: (65 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events [feature/events] Append "_append" to viewtopic_print_head [feature/events] ucp_pm_viewmessage_print_head_append [feature/events] simple_footer_end -> simple_footer_after [feature/events] Append "_prepend" to posting_editor_options [feature/events] Fix events in prosilver overall_header.html [feature/events] Fix events in prosilver overall_footer.html [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before ...
| * | | | | [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)David King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)David King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix typo in event nameDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix more subsilver2 eventsDavid King2012-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix some subsilver2 eventsDavid King2012-12-175-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Append "_append" to viewtopic_print_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] ucp_pm_viewmessage_print_head_appendDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] simple_footer_end -> simple_footer_afterDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Append "_prepend" to posting_editor_optionsDavid King2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix events in prosilver overall_header.htmlDavid King2012-12-171-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Fix events in prosilver overall_footer.htmlDavid King2012-12-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_beforeDavid King2012-12-171-1/+1
| | | | | |
| * | | | | [feature/events] There is nothing between head and body.Oleg Pudeyev2012-12-173-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Add location (prepend) to event nameMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Adjust to use prepend, not beforeMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Add overall_footer_copyright_after template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Rename event to show location around copyrightMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Add append to event nameMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | [feature/events] Correct template callsErik Frèrejean2012-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There where two `<!-- LEDGE ... -->` calls in the templates left. Replace those two calls with the proper `<!-- EVENT ... -->` call PHPBB3-9550