aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-22 09:09:08 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-22 09:09:08 +0200
commit1cc3d24cd859ed10b47aaa0117ab5647676447ee (patch)
tree69276b5de626f7afd53b85bc9c7fd9a41fae3f88 /phpBB/docs
parent1a9bc8a7adf001f2ff77f5f98f82321c302277e6 (diff)
parent583068da9d071d3350bddad8b411e8430083a174 (diff)
downloadforums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar
forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.gz
forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.bz2
forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.xz
forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index b28cb7e3a1..08b3ae96aa 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -563,6 +563,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions
+mcp_topic_options_after
+===
+* Locations:
+ + styles/prosilver/template/mcp_topic.html
+* Since: 3.1.6-RC1
+* Purpose: Add some options (field, checkbox, ...) after the subject field when split a subject
+
+mcp_topic_options_before
+===
+* Locations:
+ + styles/prosilver/template/mcp_topic.html
+* Since: 3.1.6-RC1
+* Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject
+
mcp_topic_topic_title_after
===
* Locations: