Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

6f31a6f6

Commit 6f31a6f6 authored 8 years ago by Gabriel Engel Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #4935 from RocketChat/hide-user-mute-unmute

Add option to hide user muted/unmuted messages

parents 70eaadc7 4528c00b

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-i18n/i18n/en.i18n.json 1 addition, 0 deletions

packages/rocketchat-i18n/i18n/en.i18n.json
packages/rocketchat-lib/server/startup/settings.coffee 1 addition, 0 deletions

packages/rocketchat-lib/server/startup/settings.coffee
packages/rocketchat-ui/views/app/room.coffee 12 additions, 6 deletions

packages/rocketchat-ui/views/app/room.coffee
server/methods/loadHistory.coffee 11 additions, 7 deletions

server/methods/loadHistory.coffee

with 25 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment