aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-02-20 20:42:52 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-02-20 20:42:52 +0100
commit61fa9dcb9ffb7654b9112607ae82724422781e33 (patch)
treea2326c322e2bb011a9d903f3e7817deeec3f189e /phpBB/docs
parent0dab7e255233c99aba68da8b60ebfbbdcfd20ea9 (diff)
parent461ce3f89249ca85f51ddce9a32da10ed338c22b (diff)
downloadforums-61fa9dcb9ffb7654b9112607ae82724422781e33.tar
forums-61fa9dcb9ffb7654b9112607ae82724422781e33.tar.gz
forums-61fa9dcb9ffb7654b9112607ae82724422781e33.tar.bz2
forums-61fa9dcb9ffb7654b9112607ae82724422781e33.tar.xz
forums-61fa9dcb9ffb7654b9112607ae82724422781e33.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/search_results.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 8762761304..ba92c0775c 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -896,6 +896,20 @@ quickreply_editor_message_before
* Since: 3.1.0-a4
* Purpose: Add content before the quick reply textbox
+search_results_header_after
+===
+* Locations:
+ + styles/prosilver/template/search_results.html
+* Since: 3.1.4-RC1
+* Purpose: Add content after the header of the search results
+
+search_results_header_before
+===
+* Locations:
+ + styles/prosilver/template/search_results.html
+* Since: 3.1.4-RC1
+* Purpose: Add content before the header of the search results.
+
search_results_post_after
===
* Locations:
@@ -924,6 +938,13 @@ search_results_postprofile_before
* Since: 3.1.0-b3
* Purpose: Add content directly before the post author in search results (posts view mode)
+search_results_searchbox_after
+===
+* Locations:
+ + styles/prosilver/template/search_results.html
+* Since: 3.1.4-RC1
+* Purpose: Add content right after the searchbox of the search results.
+
search_results_topic_after
===
* Locations: