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.

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

[NEW] Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) #5373

Merged
merged 14 commits into from
Apr 19, 2017

Conversation

marceloschmidt
Copy link
Member

@marceloschmidt marceloschmidt commented Dec 30, 2016

@RocketChat/core

Closes #2707
It doesn't cover snooze, but helps #2143.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-5373 December 30, 2016 01:19 Inactive
@sampaiodiego
Copy link
Member

prints pls 😊

@marceloschmidt
Copy link
Member Author

marceloschmidt commented Dec 30, 2016

image

image

image

@engelgabriel
Copy link
Member

I am just a bit worried about the UX... I was expecting mute to be a boolean... we need to review the notifications UI as a whole.. the Unread Alert is also confusing.

@lucasvanhalst
Copy link
Contributor

Mute should just turn off all kinds of notifications IMO

@graywolf336
Copy link
Contributor

I think the term "mute" is a little bit odd here, from the screenshots. If you have "Everything" selected, then are you muting everything or are you allowing everything? Same goes for "Nothing" selected, would nothing be muted or would nothing be allowed?

@marceloschmidt
Copy link
Member Author

Can we please pick a better wording for this and merge it? Let me know the best wording and I'll fix the conflicts.

# Conflicts:
#	packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html
#	packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
#	packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
#	server/publications/subscription.coffee
New options: “Disable Notifications” and “Hide Unread Room Status”.
@marceloschmidt marceloschmidt changed the title Mute notifications Disable Notifications and Hide Unread Room Status Mar 22, 2017
@marceloschmidt
Copy link
Member Author

Changed wording:

image
image

Please merge? :)

# Conflicts:
#	HISTORY.md
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-ui-sidenav/client/channels.coffee
#	packages/rocketchat-ui-sidenav/client/chatRoomItem.coffee
#	packages/rocketchat-ui-sidenav/client/combined.coffee
#	packages/rocketchat-ui-sidenav/client/directMessages.coffee
#	packages/rocketchat-ui-sidenav/client/privateGroups.coffee
#	packages/rocketchat-ui-sidenav/client/starredRooms.coffee
#	packages/rocketchat-ui-sidenav/client/unreadRooms.coffee
@marceloschmidt
Copy link
Member Author

@sampaiodiego finished solving conflicts. could you and/or @rodrigok review this please? I would like to have it merged.

@engelgabriel engelgabriel added this to the 0.56.0 milestone Apr 18, 2017
@rodrigok rodrigok changed the title Disable Notifications and Hide Unread Room Status [NEW] Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) Apr 19, 2017
@rodrigok rodrigok merged commit 67cb978 into develop Apr 19, 2017
@rodrigok rodrigok deleted the mute-notifications branch April 19, 2017 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mute channel function
6 participants