aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-04-06 14:45:20 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-04-06 14:45:20 +0200
commita11994d42479c9056c550e92928e1103bc75a658 (patch)
tree4010ccfee194c26772c6d9dfa8309c80ee03dd4d /phpBB/docs
parent4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7 (diff)
parent02202b15030b93d2a5954c7fee7e4b05e4f02e80 (diff)
downloadforums-a11994d42479c9056c550e92928e1103bc75a658.tar
forums-a11994d42479c9056c550e92928e1103bc75a658.tar.gz
forums-a11994d42479c9056c550e92928e1103bc75a658.tar.bz2
forums-a11994d42479c9056c550e92928e1103bc75a658.tar.xz
forums-a11994d42479c9056c550e92928e1103bc75a658.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/posting_body.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md21
1 files changed, 21 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 3be35cfc0c..a91c9a8ae8 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -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: