aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 20:09:27 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 20:09:27 +0100
commit73f1cfd5836d32b9339eda21430302493d79eb17 (patch)
tree575c89889fd25a3f59c10e6829f8f6a483110656 /phpBB/docs
parentd311fa2c5e10a40cf1941dd144b9a530fb745621 (diff)
parent71a015557fb605ed1739a37918746e364a13f7cc (diff)
downloadforums-73f1cfd5836d32b9339eda21430302493d79eb17.tar
forums-73f1cfd5836d32b9339eda21430302493d79eb17.tar.gz
forums-73f1cfd5836d32b9339eda21430302493d79eb17.tar.bz2
forums-73f1cfd5836d32b9339eda21430302493d79eb17.tar.xz
forums-73f1cfd5836d32b9339eda21430302493d79eb17.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md44
1 files changed, 43 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 10d912fad0..48083b2ce0 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -22,11 +22,53 @@ acp_email_options_after
* Since: 3.1.2-RC1
* Purpose: Add settings to mass email form
+acp_forums_main_settings_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums at end of main settings section
+
+acp_forums_main_settings_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums before main settings section
+
acp_forums_normal_settings_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.0-a1
-* Purpose: Add settings to forums
+* Purpose: Add settings to forums at end of normal settings section
+
+acp_forums_normal_settings_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums before normal settings section
+
+acp_forums_prune_settings_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums at end of prune settings section
+
+acp_forums_prune_settings_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums before prune settings section
+
+acp_forums_rules_settings_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums at end of rules settings section
+
+acp_forums_rules_settings_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.2-RC1
+* Purpose: Add settings to forums before rules settings section
acp_group_options_before
===