balkan/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-01 07:26:40 +09:00
commit ae68f19506
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/features/notifications/components/notification.jsx
View file

@ -179,7 +179,6 @@ class Notification extends ImmutablePureComponent {
cachedMediaWidth={this.props.cachedMediaWidth} cachedMediaWidth={this.props.cachedMediaWidth}
cacheMediaWidth={this.props.cacheMediaWidth} cacheMediaWidth={this.props.cacheMediaWidth}
unread={this.props.unread} unread={this.props.unread}
withoutEmojiReactions={true}
/> />
); );
} }

4
app/views/admin/media_attachments/_media_attachment.html.haml
View file

@ -13,14 +13,14 @@
%time.formatted{ datetime: media_attachment.status.created_at.iso8601, title: l(media_attachment.status.created_at) }= l(media_attachment.status.created_at) %time.formatted{ datetime: media_attachment.status.created_at.iso8601, title: l(media_attachment.status.created_at) }= l(media_attachment.status.created_at)
- if media_attachment.status.edited? - if media_attachment.status.edited?
· ·
= link_to t('statuses.edited_at_html', date: content_tag(:time, l(media_attachment.status.edited_at), datetime: media_attachment.status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')), admin_account_status_path(status.account_id, status), class: 'detailed-status__datetime' = link_to t('statuses.edited_at_html', date: content_tag(:time, l(media_attachment.status.edited_at), datetime: media_attachment.status.edited_at.iso8601, title: l(media_attachment.status.edited_at), class: 'formatted')), admin_account_status_path(media_attachment.status.account_id, media_attachment.status), class: 'detailed-status__datetime'
- if media_attachment.status.discarded? - if media_attachment.status.discarded?
· ·
%span.negative-hint= t('admin.statuses.deleted') %span.negative-hint= t('admin.statuses.deleted')
· ·
- if media_attachment.status.reblog? - if media_attachment.status.reblog?
= fa_icon('retweet fw') = fa_icon('retweet fw')
= t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account)) = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(media_attachment.status.proper.account))
- else - else
= fa_visibility_icon(media_attachment.status) = fa_visibility_icon(media_attachment.status)
= t("statuses.visibilities.#{media_attachment.status.visibility}") = t("statuses.visibilities.#{media_attachment.status.visibility}")