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

Add Enterprise Edition license #16801

Merged
merged 2 commits into from
Mar 11, 2020
Merged

Add Enterprise Edition license #16801

merged 2 commits into from
Mar 11, 2020

Conversation

sampaiodiego
Copy link
Member

This is a preparation to move Enterprise code to community repo.

ee/LICENSE Outdated Show resolved Hide resolved
Co-Authored-By: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
@sampaiodiego sampaiodiego requested a review from rodrigok March 10, 2020 14:34
@sampaiodiego sampaiodiego merged commit 2516626 into develop Mar 11, 2020
@sampaiodiego sampaiodiego deleted the add-ee-license branch March 11, 2020 13:02
gabriellsh added a commit to ritwizsinha/Rocket.Chat that referenced this pull request Mar 11, 2020
…6537-ritwizsinha-Issue#16499

* 'develop' of github.com:RocketChat/Rocket.Chat: (173 commits)
  [FIX] No settings to be displayed if search not found (RocketChat#16255)
  [FIX] Removed some hardcoded texts (RocketChat#16304)
  [FIX] Cannot unfollow message from thread's panel (RocketChat#16560)
  Add Enterprise Edition license (RocketChat#16801)
  [FIX] Fallback content-type as application/octet-stream for FileSystem uploads (RocketChat#16776)
  [IMPROVE] Apps-engine E2E tests (RocketChat#16781)
  [FIX] Remove spaces from i18n placeholders to show Personal access token (RocketChat#16724)
  [NEW] SAML config to allow clock drift (RocketChat#16751)
  [FIX] Slash command preview: Wrong item being selected, Horizontal scroll (RocketChat#16750)
  [FIX] Cannot pin on direct messages (RocketChat#16759)
  [FIX] Get all channels from Slack via REST API (RocketChat#16767)
  LingoHub Update 🚀 (RocketChat#16837)
  [FIX]  Flextab information is not working when clicking on visitor or agent username in Omnichannel messages (RocketChat#16797)
  Update Node to 12.16.1
  [NEW] Update Meteor to 1.9.2 (RocketChat#16718)
  [FIX] Slackbridge-import command doesn't work (RocketChat#16645)
  Fix omnichannel icon missing on sidebar (RocketChat#16775)
  [IMPROVE] Rename client-side term "Livechat" to "Omnichannel" (RocketChat#16752)
  [FIX] Language country has been ignored on translation load (RocketChat#16757)
  [FIX] Cannot edit Profile when Full Name is empty and not required (RocketChat#16744)
  ...
gabriellsh added a commit that referenced this pull request Mar 13, 2020
…exact_search

* 'develop' of github.com:RocketChat/Rocket.Chat: (178 commits)
  [IMPROVE] Add option to require authentication on user's shield endpoint (#16845)
  [FIX] Custom OAuth Bug (#16811)
  [FIX] Integrations page pagination (#16838)
  fix: livechat/facebook missing visitor data after registerGuest (#16810)
  [FIX] Invite links counting users already joined (#16591)
  [FIX] No settings to be displayed if search not found (#16255)
  [FIX] Removed some hardcoded texts (#16304)
  [FIX] Cannot unfollow message from thread's panel (#16560)
  Add Enterprise Edition license (#16801)
  [FIX] Fallback content-type as application/octet-stream for FileSystem uploads (#16776)
  [IMPROVE] Apps-engine E2E tests (#16781)
  [FIX] Remove spaces from i18n placeholders to show Personal access token (#16724)
  [NEW] SAML config to allow clock drift (#16751)
  [FIX] Slash command preview: Wrong item being selected, Horizontal scroll (#16750)
  [FIX] Cannot pin on direct messages (#16759)
  [FIX] Get all channels from Slack via REST API (#16767)
  LingoHub Update 🚀 (#16837)
  [FIX]  Flextab information is not working when clicking on visitor or agent username in Omnichannel messages (#16797)
  Update Node to 12.16.1
  [NEW] Update Meteor to 1.9.2 (#16718)
  ...
@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