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

[NEW] Enterprise Edition #16944

Merged
merged 9 commits into from
Mar 20, 2020
Merged

[NEW] Enterprise Edition #16944

merged 9 commits into from
Mar 20, 2020

Conversation

sampaiodiego
Copy link
Member

All hard work from @pierre-lehnen-rc <3

@sampaiodiego sampaiodiego added this to the 3.1.0 milestone Mar 20, 2020
@sampaiodiego sampaiodiego requested a review from rodrigok March 20, 2020 05:05
@lgtm-com
Copy link

lgtm-com bot commented Mar 20, 2020

This pull request introduces 2 alerts when merging 5af3612 into 12fe0c3 - view on LGTM.com

new alerts:

  • 1 for Superfluous trailing arguments
  • 1 for Incomplete string escaping or encoding

ee/i18n/en.i18n.json Show resolved Hide resolved
@lgtm-com
Copy link

lgtm-com bot commented Mar 20, 2020

This pull request introduces 2 alerts when merging 5ca73cb into f32703f - view on LGTM.com

new alerts:

  • 1 for Superfluous trailing arguments
  • 1 for Incomplete string escaping or encoding

@sampaiodiego sampaiodiego merged commit 4c62601 into develop Mar 20, 2020
@sampaiodiego sampaiodiego deleted the ee-migration branch March 20, 2020 22:23
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 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