Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2022-04-30 21:56:08 +02:00
commit 6e18e8e10f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 16 additions and 0 deletions

View file

@ -2530,6 +2530,13 @@ ucp_header_friends_online_username_full_prepend
* Since: 3.2.10-RC1 * Since: 3.2.10-RC1
* Purpose: Prepend information to online friends username in UCP * Purpose: Prepend information to online friends username in UCP
ucp_main_bookmarks_topic_title_after
===
* Locations:
+ styles/prosilver/template/ucp_main_bookmarks.html
* Since: 3.3.8-RC1
* Purpose: Add content right after the topic title viewing UCP bookmarks
ucp_main_front_user_activity_after ucp_main_front_user_activity_after
=== ===
* Locations: * Locations:
@ -2558,6 +2565,13 @@ ucp_main_front_user_activity_prepend
* Since: 3.1.11-RC1 * Since: 3.1.11-RC1
* Purpose: Add content before first user activity info viewing UCP front page * Purpose: Add content before first user activity info viewing UCP front page
ucp_main_subscribed_topic_title_after
===
* Locations:
+ styles/prosilver/template/ucp_main_subscribed.html
* Since: 3.3.8-RC1
* Purpose: Add content right after the topic title viewing UCP subscribed topics
ucp_pm_history_post_buttons_after ucp_pm_history_post_buttons_after
=== ===
* Locations: * Locations:

View file

@ -70,6 +70,7 @@
</a> </a>
<!-- ENDIF --> <!-- ENDIF -->
<br /> <br />
{% EVENT ucp_main_bookmarks_topic_title_after %}
<!-- IF .topicrow.pagination --> <!-- IF .topicrow.pagination -->
<div class="pagination"> <div class="pagination">
<ul> <ul>

View file

@ -120,6 +120,7 @@
</a> </a>
<!-- ENDIF --> <!-- ENDIF -->
<br /> <br />
{% EVENT ucp_main_subscribed_topic_title_after %}
<!-- IF .topicrow.pagination --> <!-- IF .topicrow.pagination -->
<div class="pagination"> <div class="pagination">
<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span> <span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>