gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'kb_lts' into kb_development

Browse source
This commit is contained in:
KMY 2023-10-03 20:37:27 +09:00
commit 88d0023a46
7 changed files with 2 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/directory/components/account_card.jsx
View file

@ -202,7 +202,7 @@ class AccountCard extends ImmutablePureComponent {
<div className='account-card__actions'>
<div className='account-card__counters'>
<div className='account-card__counters__item'>
<ShortNumber value={account.get('statuses_count')} />
<ShortNumber value={account.get('statuses_count')} isHide={account.getIn(['other_settings', 'hide_statuses_count']) || false} />
<small>
<FormattedMessage id='account.posts' defaultMessage='Posts' />
</small>

2
app/javascript/mastodon/features/emoji_reactions/index.jsx
View file

@ -86,7 +86,7 @@ class EmojiReactions extends ImmutablePureComponent {
showBackButton
multiColumn={multiColumn}
extraButton={(
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleLoadMore}><Icon id='refresh' /></button>
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
)}
/>