aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/events.md
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 19:25:32 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 19:25:32 +0100
commit987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439 (patch)
treea44467f04dff803edbde24e95ca4d1bca9057a40 /phpBB/docs/events.md
parent040d451dcca9ae54d8f4b7bdd2f231033765a8f2 (diff)
parentc31b53942d7b77f9cb069da24eecc703fba34468 (diff)
downloadforums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar
forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.gz
forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.bz2
forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.xz
forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/memberlist_search.html
Diffstat (limited to 'phpBB/docs/events.md')
-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 6bbaed91b8..436a99d478 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -392,6 +392,27 @@ memberlist_body_username_prepend
* Purpose: Add information before every username in the memberlist. Works in
all display modes (leader, group and normal memberlist).
+memberlist_search_fields_after
+===
+* Locations:
+ + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information after the search fields column.
+
+memberlist_search_fields_before
+===
+* Locations:
+ + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information before the search fields column.
+
+memberlist_search_sorting_options_before
+===
+* Locations:
+ + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information before the search sorting options field.
+
memberlist_view_contact_after
===
* Locations: