mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
This commit is contained in:
Marc Alexander
2015-11-13 09:36:04 +01:00
parent 74cd82dff8 8bb4af6271
commit f7a25ad8c3
2 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
phpBB/docs/events.md
View File

@@ -1428,6 +1428,13 @@ quickreply_editor_subject_before
* Since: 3.1.7-RC1
* Purpose: Add content before the quick reply subject textbox
search_body_form_after
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content after the search form
search_body_form_before
===
* Locations:
@@ -1435,6 +1442,90 @@ search_body_form_before
* Since: 3.1.5-RC1
* Purpose: Add content before the search form
search_body_recent_search_after
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content after the recent search queries list
search_body_recent_search_before
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content before the recent search queries list
search_body_search_display_options_append
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the bottom of the search query display options fields set
search_body_search_display_options_prepend
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the top of the search query display options fields set
search_body_search_options_after
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content after the search query options fields set
search_body_search_options_append
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the bottom of the search query options fields set
search_body_search_options_before
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content before the search query options fields set
search_body_search_options_prepend
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the top of the search query options fields set
search_body_search_query_after
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content after the search query fields set
search_body_search_query_append
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the bottom of the search query fields set
search_body_search_query_before
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Add content before the search query fields set
search_body_search_query_prepend
===
* Locations:
+ styles/prosilver/template/search_body.html
* Since: 3.1.7-RC1
* Purpose: Put content at the top of the search query fields set
search_results_header_after
===
* Locations: