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

[FIX] Push settings enabled when push gateway is selected #17582

Merged
merged 3 commits into from
May 8, 2020

Conversation

geekgonecrazy
Copy link
Contributor

@geekgonecrazy geekgonecrazy commented May 8, 2020

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.

image

image

@geekgonecrazy geekgonecrazy requested a review from sampaiodiego May 8, 2020 20:37
@sampaiodiego sampaiodiego added this to the 3.2.2 milestone May 8, 2020
@sampaiodiego 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
@sampaiodiego sampaiodiego merged commit 161b5d4 into develop May 8, 2020
@sampaiodiego sampaiodiego deleted the disable-push-settings-on-gateway branch May 8, 2020 22:47
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 <chinello@gmail.com>
@sampaiodiego sampaiodiego mentioned this pull request May 11, 2020
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)
This was referenced May 28, 2020
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.

2 participants