This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
Mm 23120/picking conflicting changes #7958
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fixed the MM-34095 issue * Solved several issues from the MM-23120 epic Solved the MM-33149 issue Solved the MM-33195 issue Solved the MM-33214 issue Solved the MM-33220 issue Solved the MM-33246 issue Solved the MM-33433 issue Solved the MM-34571 issue Solved the MM-33431 issue * Updated snapshots * Fixed some UI issues Removed the dot in channel header after custom status Changed the marginLeft for the custom status emoji in switch channel modal Changed opacity of custom status emoji on hover * Update components/custom_status/custom_status_modal.tsx Co-authored-by: Michel Engelen <[email protected]> * Fixed lint error * Fixed the styling in switch channel modal Co-authored-by: Manoj <[email protected]> Co-authored-by: Michel Engelen <[email protected]> (cherry picked from commit c2c4725)
* MM-34670 - moved status indicator to the avatar * MM-33837 - added channel slug info to displayname * make linter happy :P * PR review remarks * visually centered the avatar * pulled status icon 2px up and 1px left Co-authored-by: Mattermod <[email protected]> (cherry picked from commit d12ce41)
Willyfrog
approved these changes
Apr 20, 2021
amyblais
added
4: Reviews Complete
|
Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour. |
|
Trying to auto merge this PR. |
|
Pull Request successfully merged |
amyblais
added
Changelog/Not Needed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Cherry-picking changes from the PRs #7932 and #7843 and resolving resulting conflicts.
Related Pull Requests