tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change "Conversations" back to "Direct messages" and add warning in web UI (#18289)

Browse Source 
Partially reverts #18146
This commit is contained in:
Eugen Rochko
2022-05-03 09:09:09 +02:00
committed by GitHub
parent aed1c47cb1
commit 7e244879fe
7 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/components/status_action_bar.js
View File

@ -266,6 +266,7 @@ class StatusActionBar extends ImmutablePureComponent {
menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
} else {
menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
menu.push(null);
if (relationship && relationship.get('muting')) {