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

Remove unnecessary setting redefinition #17587

Merged
merged 1 commit into from
May 14, 2020

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented May 9, 2020

No description provided.

@rodrigok rodrigok added this to the 3.3.0 milestone May 9, 2020
@rodrigok rodrigok requested review from ggazzo and sampaiodiego May 9, 2020 18:31
@sampaiodiego sampaiodiego merged commit 362366b into develop May 14, 2020
@sampaiodiego sampaiodiego deleted the remove-template-redefinition branch May 14, 2020 13:26
ggazzo added a commit that referenced this pull request May 15, 2020
…to new/oauth_page

* 'admin-refactor' of github.com:RocketChat/Rocket.Chat:
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
ggazzo added a commit that referenced this pull request May 15, 2020
…/new-threads

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Regression: Pressing enter on search reloads the page - admin pages (#17663)
  [NEW] Admin refactor  Second phase (#17551)
  [IMPROVE] Unused styles (#17554)
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
ggazzo added a commit that referenced this pull request May 16, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat: (25 commits)
  [FIX] Not redirecting to `First Channel After Login` on register (#17664)
  Regression: Pressing enter on search reloads the page - admin pages (#17663)
  [NEW] Admin refactor  Second phase (#17551)
  [IMPROVE] Unused styles (#17554)
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
  Hyper.sh went out of business in early 2019 (#17622)
  [NEW] Add Permissions to deal with Omnichannel visitor past chats history (#17580)
  [NEW] Add permissions to deal with Omnichannel custom fields (#17567)
  [FIX] Livechat iframe allow microphone and camera (#9956)
  [FIX] Do not allow passwords on private channels (#15642)
  [FIX] Mail Messages > Cannot mail own user. (#17625)
  [FIX] remove multiple options from dontAskMeAgain (#17514)
  ...
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