Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 3, 2022
Merged

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

merged 1 commit into from
May 3, 2022

Conversation

Gargron
Copy link
Member

@Gargron Gargron commented May 3, 2022

Partially reverts #18146

  • "Only people I mention" remains in dropdown for consistency with iOS/Android apps and as the most self-explanatory label
  • The icon remains the at-symbol for consistency with iOS/Android apps and same as above
  • "Conversations" becomes "Direct messages" again and gets the end-to-end encryption warning at the top
  • "Direct message" shortcuts on dropdown menus are restored

@Gargron Gargron added the ui Front-end, design label May 3, 2022
@Gargron Gargron merged commit 7e24487 into main May 3, 2022
@Gargron Gargron deleted the fix-dm-labels branch May 3, 2022 07:09
kadoshita pushed a commit to kadoshita/mastodon that referenced this pull request May 4, 2022
@Gargron @kadoshita
Change "Conversations" back to "Direct messages" and add warning in w…
69ff268 
…eb UI (mastodon#18289)

Partially reverts mastodon#18146
@ahox ahox mentioned this pull request Nov 25, 2022
Closed
@masarakki masarakki mentioned this pull request Apr 19, 2023
Closed
ClearlyClaire pushed a commit to ClearlyClaire/mastodon that referenced this pull request Jul 6, 2023
@Gargron
Change "Conversations" back to "Direct messages" and add warning in w…
3a79447 
…eb UI (mastodon#18289)

Partially reverts mastodon#18146
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ClearlyClaire ClearlyClaire ClearlyClaire approved these changes

Assignees
No one assigned
Labels
ui Front-end, design
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Gargron @ClearlyClaire