Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-19309] Name Display Lock #4148

Merged
merged 22 commits into from
Nov 15, 2019
Merged

[MM-19309] Name Display Lock #4148

merged 22 commits into from
Nov 15, 2019

Conversation

hahmadia
Copy link
Contributor

@hahmadia hahmadia commented Nov 6, 2019 •
edited
Loading

Summary

Allows a System Admin to lock users from changing the name display preference. If set to true, users cannot change the way users name is display in a channel and is synchronised with whatever the system admin has set.

Ticket Link

https://mattermost.atlassian.net/browse/MM-19309

Related Pull Requests

Screenshots

MM19309 (1)

@hahmadia hahmadia added Do Not Merge Should not be merged until this label is removed Work in Progress Not yet ready for review labels Nov 6, 2019
@hahmadia hahmadia added this to the v5.18.0 milestone Nov 6, 2019
@hahmadia hahmadia mentioned this pull request Nov 7, 2019
Merged
@hahmadia hahmadia changed the title WIP: [MM-19309] Name Display Lock [MM-19309] Name Display Lock Nov 7, 2019
@hahmadia hahmadia added 1: PM Review Requires review by a product manager 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) and removed Do Not Merge Should not be merged until this label is removed Work in Progress Not yet ready for review labels Nov 7, 2019
@hahmadia hahmadia requested review from srkgupta, thefactremains and a team November 7, 2019 19:21
@ghost ghost requested review from cpanato and iomodo and removed request for a team November 7, 2019 19:22
@hahmadia hahmadia requested review from sbishel and a team and removed request for cpanato and iomodo November 7, 2019 19:26
@ghost ghost requested review from levb and removed request for a team November 7, 2019 19:26
@hahmadia hahmadia removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Nov 14, 2019
@hahmadia hahmadia removed the Awaiting Submitter Action Blocked on the author label Nov 14, 2019
@hahmadia
Copy link
Contributor Author

@srkgupta Added Cypress test and addressed the text issue.

@hahmadia hahmadia removed the 1: PM Review Requires review by a product manager label Nov 14, 2019
srkgupta
srkgupta suggested changes Nov 15, 2019
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @hahmadia. Great start. The Cypress test looks great except for couple of changes requested. The helper text looks fine now.

srkgupta
srkgupta approved these changes Nov 15, 2019
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @hahmadia. The changes looks good. Approving the PR.

PS: Please fix the merge conflict issue.

@srkgupta srkgupta added 4: Reviews Complete All reviewers have approved the pull request QA Review Done and removed 3: QA Review Requires review by a QA tester labels Nov 15, 2019
@hahmadia hahmadia added the AutoMerge used by Mattermod to merge PR automatically label Nov 15, 2019
@hahmadia hahmadia removed the AutoMerge used by Mattermod to merge PR automatically label Nov 15, 2019
@hahmadia hahmadia merged commit cad27b0 into mattermost:master Nov 15, 2019
@hahmadia hahmadia deleted the MM-19309-NameDisplayLock branch November 15, 2019 19:05
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Done Required documentation has been written labels Nov 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@levb levb levb approved these changes

@srkgupta srkgupta srkgupta approved these changes

@sbishel sbishel sbishel approved these changes

@thefactremains thefactremains thefactremains approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Done Required documentation has been written QA Review Done
Projects
None yet
Milestone
v5.18.0
Development

Successfully merging this pull request may close these issues.
6 participants
@hahmadia @levb @srkgupta @sbishel @thefactremains @amyblais