diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:07:29 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:07:29 +0200 |
| commit | 450e5b36b89dc5570a89a3bc28dcd4cf21b1b783 (patch) | |
| tree | 50115a86ac7decb91c6be803c28e8e2236123ea5 /phpBB/docs | |
| parent | 70b04016eb123e02868a5391677d75fffc1155ea (diff) | |
| parent | aaa99b471913e40ef5a31c12cba70d9fbb653de6 (diff) | |
| download | forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.gz forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.bz2 forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.xz forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
phpBB/styles/subsilver2/template/mcp_forum.html
phpBB/styles/subsilver2/template/search_results.html
phpBB/styles/subsilver2/template/viewforum_body.html
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/events.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 410ae2ad7d..ea081350a4 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1694,6 +1694,15 @@ topiclist_row_append * Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) +topiclist_row_topic_title_after +=== +* Locations: + + styles/prosilver/template/search_results.html + + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.10-RC1 +* Purpose: Add content into topic rows (after the elements containing the topic titles) + ucp_agreement_terms_after === * Locations: |