mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
This commit is contained in:
Joas Schilling
2015-04-06 14:45:20 +02:00
parent 4ce0d88ffd 02202b1503
commit a11994d424
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/docs/events.md
View File

@@ -833,6 +833,13 @@ overall_header_stylesheets_after
* Purpose: Add asset calls after stylesheets within the `</head>` tag.
Note that INCLUDECSS will not work with this event.
posting_editor_bbcode_status_after
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.4-RC1
* Purpose: Add content after bbcode status
posting_editor_buttons_after
===
* Locations:
@@ -875,6 +882,20 @@ posting_editor_options_prepend
* Since: 3.1.0-a1
* Purpose: Add posting options on the posting screen
posting_editor_smilies_after
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.4-RC1
* Purpose: Add content after smilies
posting_editor_smilies_before
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.4-RC1
* Purpose: Add content before the smilies
posting_editor_subject_after
===
* Locations: