diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-27 10:54:48 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-27 10:54:48 +0100 |
| commit | a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4 (patch) | |
| tree | f8d55c0b706866b5cf43337a5b566f46cf1c76c5 /phpBB/docs | |
| parent | 24fd031648f93b850c0e96e97bcbf0a61035459c (diff) | |
| parent | 34389df1aecb7e72f0e61f05016f5ff5567ebb52 (diff) | |
| download | forums-a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4.tar forums-a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4.tar.gz forums-a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4.tar.bz2 forums-a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4.tar.xz forums-a937e38bd5d71d1cdb5ecc6de23d88c7d04f21c4.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/docs/events.md
phpBB/styles/subsilver2/template/memberlist_view.html
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/events.md | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index acc876ea96..410ae2ad7d 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -937,6 +937,20 @@ memberlist_view_contact_before * Since: 3.1.0-b2 * Purpose: Add content before the user contact part of any user profile +memberlist_view_contact_custom_fields_after +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content after the user contact related custom fields + +memberlist_view_contact_custom_fields_before +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content before the user contact related custom fields + memberlist_view_content_append === * Locations: @@ -951,6 +965,20 @@ memberlist_view_content_prepend * Since: 3.1.0-b3 * Purpose: Add custom content to the user profile view before the main content +memberlist_view_non_contact_custom_fields_after +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content after the user not contact related custom fields + +memberlist_view_non_contact_custom_fields_before +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content before the user not contact related custom fields + memberlist_view_rank_avatar_after === * Locations: @@ -993,6 +1021,20 @@ memberlist_view_user_statistics_before * Since: 3.1.0-a1 * Purpose: Add entries before the user statistics part of any user profile +memberlist_view_zebra_after +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content after the user friends/foes links + +memberlist_view_zebra_before +=== +* Locations: + + styles/prosilver/template/memberlist_view.html +* Since: 3.1.9-RC1 +* Purpose: Add content before the user friends/foes links + navbar_header_logged_out_content === * Locations: |