-
Notifications
You must be signed in to change notification settings - Fork 11.3k
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] Option to ignore users on channels #10517
Merged
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
db30bd7
added ignored flag on messages
ggazzo b7c3588
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
gdelavald 7fcbfe7
Revert change to map that breaks subscriptions
gdelavald 65b1b73
Adds toggling to show ignored message
gdelavald 7385581
Add new icon, ignore message and css for sequential messages
gdelavald 2080f32
ignore user on message action
ggazzo 45d7c46
Merge remote-tracking branch 'origin/ignore0user' into ignore0user
ggazzo 05f4336
Add i18n for ignored message
gdelavald 5046b14
Merge branch 'ignore0user' of https://github.com/RocketChat/Rocket.Ch…
gdelavald 4758873
Adds translations and fixes access to undefined subscriptions
gdelavald b8ab420
removed file
ggazzo 143b0e7
Merge remote-tracking branch 'origin/ignore0user' into ignore0user
ggazzo 09fbfce
ignored title i18n and fix popover on member list
ggazzo 26f31e5
Merge branch 'develop' into ignore0user
ggazzo fd18b2b
i18n
ggazzo 31c70cf
Merge remote-tracking branch 'origin/ignore0user' into ignore0user
ggazzo bfcf0ff
do not allow ignore user on DM
ggazzo e592bf5
ignore user rest method
ggazzo a2c630d
Remove mixed tabs and spaces
gdelavald 11feb13
Remove trailing space
gdelavald c3d9162
Merge branch 'develop' into ignore0user
gdelavald b5ad5ad
fix review
ggazzo c84cc28
fix review
ggazzo 14927de
fix css identation
karlprieb 2ab6f5e
fix more css identation
karlprieb b564b20
check if ignore param is a boolean
ggazzo 782fc6b
Merge remote-tracking branch 'origin/ignore0user' into ignore0user
ggazzo 2867de7
remove file metor.id
ggazzo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix review
- Loading branch information
commit b5ad5ad182ba1832a37dac868d7b49efb6e5287d
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# This file contains a token that is unique to your project. | ||
# Check it into your repository along with the rest of this directory. | ||
# It can be used for purposes such as: | ||
# - ensuring you don't accidentally deploy one app on top of another | ||
# - providing package authors with aggregated statistics | ||
|
||
u4k2dnt1ek.uewj3t4xsn4 |
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a new line before this. (I'm being nitpicky, but yeah).