1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-08 18:05:17 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-06-07 23:46:56 +02:00
commit 9d877917fa
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 45 additions and 4 deletions

View File

@ -1910,6 +1910,20 @@ posting_preview_poll_after
* Since: 3.1.7-RC1
* Purpose: Add content after the poll preview block
posting_review_row_post_author_username_append
===
* Locations:
+ styles/prosilver/template/posting_review.html
* Since: 3.2.8-RC1
* Purpose: Append information to post author username of member
posting_review_row_post_author_username_prepend
===
* Locations:
+ styles/prosilver/template/posting_review.html
* Since: 3.2.8-RC1
* Purpose: Prepend information to post author username of member
posting_topic_review_row_content_after
===
* Locations:
@ -1917,6 +1931,20 @@ posting_topic_review_row_content_after
* Since: 3.2.4-RC1
* Purpose: Add content after the message content in topic review
posting_topic_review_row_post_author_username_append
===
* Locations:
+ styles/prosilver/template/posting_topic_review.html
* Since: 3.2.8-RC1
* Purpose: Append information to post author username of member
posting_topic_review_row_post_author_username_prepend
===
* Locations:
+ styles/prosilver/template/posting_topic_review.html
* Since: 3.2.8-RC1
* Purpose: Prepend information to post author username of member
posting_topic_review_row_post_details_after
===
* Locations:
@ -2364,6 +2392,20 @@ ucp_pm_history_review_before
* Since: 3.1.6-RC1
* Purpose: Add content before the private messages history review.
ucp_pm_history_row_message_author_username_append
===
* Locations:
+ styles/prosilver/template/ucp_pm_history.html
* Since: 3.2.8-RC1
* Purpose: Append information to message author username of member
ucp_pm_history_row_message_author_username_prepend
===
* Locations:
+ styles/prosilver/template/ucp_pm_history.html
* Since: 3.2.8-RC1
* Purpose: Prepend information to message author username of member
ucp_pm_viewmessage_avatar_after
===
* Locations:

View File

@ -22,7 +22,7 @@
<i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{post_review_row.MINI_POST}</span>
</a>
<!-- ENDIF -->
{L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> &raquo; {post_review_row.POST_DATE}
{L_POST_BY_AUTHOR} <!-- EVENT posting_review_row_post_author_username_prepend --><strong>{post_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_review_row_post_author_username_append --> &raquo; {post_review_row.POST_DATE}
</p>
<div class="content">{post_review_row.MESSAGE}</div>

View File

@ -54,7 +54,7 @@
<i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{topic_review_row.MINI_POST}</span>
</a>
<!-- ENDIF -->
{L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}
{L_POST_BY_AUTHOR} <!-- EVENT posting_topic_review_row_post_author_username_prepend --><strong>{topic_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_topic_review_row_post_author_username_append --> &raquo; {topic_review_row.POST_DATE}
</p>
<!-- EVENT posting_topic_review_row_post_details_after -->

View File

@ -36,7 +36,7 @@
<p class="author">
<span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{history_row.MINI_POST}</span></span> {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong>
<br />
{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}
{L_MESSAGE_BY_AUTHOR} <!-- EVENT ucp_pm_history_row_message_author_username_prepend -->{history_row.MESSAGE_AUTHOR_FULL}<!-- EVENT ucp_pm_history_row_message_author_username_append -->
</p>
<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>
<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
@ -54,4 +54,3 @@
<i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span>
</a>
</p>