aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-301-7/+7
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * [ticket/13887] Minor JS refactoringCallum Macrae2015-05-292-6/+6
| | | | | | | | PHPBB3-13887
| * [ticket/13887] Use correct JSDoc syntaxCallum Macrae2015-05-291-2/+2
| | | | | | | | PHPBB3-13887
* | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-292-3/+2
|\ \ | | | | | | | | | [ticket/11742] Remove tabs-to-space conversion in [code]
| * | [ticket/11742] Removed whitespace collapsing in codebox [ci skip]JoshyPHP2015-05-231-1/+0
| | | | | | | | | | | | PHPBB3-11742
| * | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-231-2/+2
| | | | | | | | | | | | PHPBB3-11742
* | | Merge branch '3.1.x'Marc Alexander2015-05-281-1/+16
|\ \ \ | | |/ | |/|
| * | Merge pull request #3640 from callumacrae/ticket/13876Marc Alexander2015-05-281-1/+16
| |\ \ | | | | | | | | | | | | [ticket/13876] Use webfontloader asyncronously.
| | * | [ticket/13876] set webfont async to trueCallum Macrae2015-05-281-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13876
| | * | [ticket/13876] Use webfontloader asyncronously.Callum Macrae2015-05-281-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds typekit and Google's webfontloader and calls it asyncronously, removing the SPOF in the header. Now, if google goes down, some buttons display with a different font. https://github.com/typekit/webfontloader PHPBB3-13876
* | | | Merge branch '3.1.x'Cesar G2015-05-281-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13878] Display background images when printing topic in webkit
| * | | [ticket/13878] Display background images when printing topic in webkitMarc Alexander2015-05-281-0/+1
| |/ / | | | | | | | | | PHPBB3-13878
* | | Merge branch '3.1.x'Marc Alexander2015-05-281-8/+7
|\ \ \ | |/ /
| * | Merge pull request #3637 from callumacrae/ticket/13873Marc Alexander2015-05-281-8/+7
| |\ \ | | | | | | | | | | | | [ticket/13873] Removed broken print stylesheet.
| | * | [ticket/13873] Removed broken print stylesheet.Callum Macrae2015-05-281-8/+7
| | | | | | | | | | | | | | | | PHPBB3-13873
* | | | Merge branch '3.1.x'Cesar G2015-05-282-0/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation
| * | | Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.xCesar G2015-05-282-0/+15
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/12542: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation
| | * | [ticket/12542] Use more specific CSS for drag-n-dropMarc Alexander2015-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the CSS gets overwritten by other CSS rules. PHPBB3-12542
| | * | [ticket/12542] Do not use browser specific css for outlineMarc Alexander2015-05-232-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the CSS selector for the drag'n'drop was simplified to only use the class. PHPBB3-12542
| | * | [ticket/12542] Use extended CSS for all browsersMarc Alexander2015-04-292-1/+21
| | | | | | | | | | | | | | | | PHPBB3-12542
| | * | [ticket/12542] Add different outline colors for body & textareaMarc Alexander2015-04-291-1/+5
| | | | | | | | | | | | | | | | PHPBB3-12542
| | * | [ticket/12542] Add initial drag-n-drop animationMarc Alexander2015-04-282-0/+7
| | | | | | | | | | | | | | | | PHPBB3-12542
* | | | Merge branch '3.1.x'Cesar G2015-05-281-13/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
| * | | Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.xCesar G2015-05-281-13/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Wolfsblvt/ticket/13787: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
| | * | | [ticket/13787] Remove duplicate entry of poll_delete in prosilver templateWolfsblvt2015-04-271-13/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When options are shown and poll delete is allowed, the option to delete polls is shown twice. This is fixed here by moving the if poll delete check out of the outer if, wich makes it also more consistent with the new event. PHPBB3-13787
* | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | * 3.1.x: [ticket/13808] search_body_form_before Conflicts: phpBB/styles/subsilver2/template/search_body.html
| * | Merge pull request #3600 from dragosvr92/ticket/13808Joas Schilling2015-05-282-0/+2
| |\ \ | | | | | | | | | | | | [ticket/13808] search_body_form_before
| | * | [ticket/13808] search_body_form_beforedragosvr922015-05-092-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions may be designed to add secondary search options, such as Google search in the search_body.html. There are no events in the searchbody, so this should be merged. PHPBB3-13808
* | | | Merge branch '3.1.x'Tristan Darricau2015-05-191-4/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3619 from javiexin/ticket/13852Tristan Darricau2015-05-191-4/+4
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13852] Consistent tab navigation when login in
| | * | | [ticket/13852] Consistent tab navigation when login injaviexin2015-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tabindex attribute to input elements in index_body.html to make tab navigation consistent with that of login_body.html. PHPBB3-13852
* | | | | Merge branch '3.1.x'Oliver Schramm2015-05-151-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3563 from rxu/ticket/13791Oliver Schramm2015-05-151-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13791] Add more post buttons template events to viewtopic_body.html
| | * | | | [ticket/13791] Add more post buttons template events to viewtopic_body.htmlrxu2015-05-011-0/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is to allow adding custom post buttons outside of original post buttons conditionals/list in prosilver (for subsilver2 it's not the issue). PHPBB3-13791
* | | | | Merge branch '3.1.x'Marc Alexander2015-05-141-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | Merge pull request #3540 from RMcGirr83/ticket/13699Marc Alexander2015-05-142-3/+4
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/13699] Add event before and after forum title in viewforum
| | * | | [ticket/13699] Add event before and after forum title in viewforumRichard McGirr2015-05-052-3/+4
| | |/ / | | | | | | | | | | | | PHPBB3-13699
* | | | Merge branch '3.1.x'Marc Alexander2015-05-081-0/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3530 from VSEphpbb/ticket/13753Marc Alexander2015-05-081-0/+2
| |\ \ \ | | |/ / | |/| | | | | | [ticket/13753] Add template events to forum category row headers
| | * | [ticket/13753] Add template events to forum category row headersMatt Friedman2015-04-091-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13753
| * | | Update version to 3.1.4-RC1Joas Schilling2015-04-092-4/+4
| | | |
* | | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-062-1/+6
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13710] Allow template events near smilies display
| | * | | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-192-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13710
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-061-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md
| | * | | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events wrap the includes of posting_pm_header.html to add some content before and after it. PHPBB3-13701
* | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_poll_body.html
| * | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-062-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13739] Add template core event posting_poll_body_options_after
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing order of if statement and event PHPBB3-13739