-
Notifications
You must be signed in to change notification settings - Fork 10.7k
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
[FIX] Push settings enabled when push gateway is selected #17582
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
sampaiodiego
approved these changes
May 8, 2020
sampaiodiego
changed the title
[Fix] Push settings enabled when push gateway is selected
[FIX] Push settings enabled when push gateway is selected
May 8, 2020
ggazzo
added a commit
that referenced
this pull request
May 10, 2020
…/new-threads * 'develop' of github.com:RocketChat/Rocket.Chat: [FIX] Push settings enabled when push gateway is selected (#17582) [FIX] LDAP login on Enteprise Version (#17508) [FIX] Login Forbidden on servers that had LDAP enabled in the past (#17579) [FIX] Email configs not updating after setting changes (#17578) [FIX] Error during data export for DMs (#17577) Regression: Override via env for string settings not working (#17576) [FIX] Emoji picker search broken (#17570) Add some missing metadata information (#17524) Bump jquery from 3.3.1 to 3.5.0 (#17486) [NEW] Show user's status description by the usernames in messages list (#14892) DPlatform is deprecated and the replacement does not support rocket.chat (#17040)
sampaiodiego
added a commit
that referenced
this pull request
May 11, 2020
* Disable push settings if gateway is selected * Use variable for enableQueries Co-authored-by: Diego Sampaio <[email protected]>
Merged
gabriellsh
added a commit
that referenced
this pull request
May 11, 2020
…grations * 'develop' of github.com:RocketChat/Rocket.Chat: [FIX] Push settings enabled when push gateway is selected (#17582)
ggazzo
added a commit
that referenced
this pull request
May 11, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat: [FIX] Push settings enabled when push gateway is selected (#17582)
ggazzo
added a commit
that referenced
this pull request
May 12, 2020
…ve-get-dom * 'develop' of github.com:RocketChat/Rocket.Chat: [FIX] Push settings enabled when push gateway is selected (#17582) [FIX] LDAP login on Enteprise Version (#17508) [FIX] Login Forbidden on servers that had LDAP enabled in the past (#17579) [FIX] Email configs not updating after setting changes (#17578) [FIX] Error during data export for DMs (#17577) Regression: Override via env for string settings not working (#17576) [FIX] Emoji picker search broken (#17570) Add some missing metadata information (#17524) Bump jquery from 3.3.1 to 3.5.0 (#17486) [NEW] Show user's status description by the usernames in messages list (#14892) DPlatform is deprecated and the replacement does not support rocket.chat (#17040) Regression: RegExp callbacks of settings were not being called (#17552) Meteor update to version 1.10.2 (#17533) Fix default offline channel name when saving departments. (#17553) [NEW] Screen Lock settings - mobile client (#17523)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should reduce confusion. If push gateway is selected setting the other push settings are pointless. So this will help reflect that when gateway is selected these settings can't be used.