Merged
Conversation
Merge master into develop & Set version to 1.3.0-develop
Co-Authored-By: Diego Sampaio <chinello@gmail.com> Co-Authored-By: Tasso Evangelista <tasso.evangelista@rocket.chat>
… status when office hours are closed. (#14921)
* Remove broken markup * Recover lost class
Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](jquery/jquery@3.3.1...3.4.0) Signed-off-by: dependabot[bot] <support@github.com>
…isitors (#14970) * Remove validations before storing visitor navigation history. * Removed unused imports.
* fix scroll * fix review * ops
* Show the subscription apps different from regular purchase prices * Update app download calls return a Buffer directly * Add X-Apps-Engine-Version header to marketplace requests * Add getActiveUserCount method to apps-engine user bridge * Add distinction for purchase type on apps list * Fix the issues with displaying subscriptions * Remove external federated users from active user count * Fix usage of federation module * Change app installation to validate license * Change the bridges to correctly query the workspace public key * Change marketplaceUrl to marketplace-beta * Update Apps and Marketplace styles (temp) * Update price column on Marketplace * Update status column on Marketplace * Fix Marketplace app list update * Remove log from client orchestrator * Refactor server orchestrator * Change rest api for license validation * Add popover to Marketplace app list * Add card (subscription) icon * Update active user count method * Update appManage template (partial) * Update appManage template * Add missing i18n strings * Add cron routine to update apps info * Add options parameter to new methods on model Users * Revert testing settings * Bump Apps-Engine version
* Show helpful error when oplog is missing * Remove unused files
…get an app's versions (#15039)
* Alert admins about apps on invalid state * Implement ui for warning and error alerts in apps * Open detail modal on viewing subscription info instead of the subscribe one. Check license after close * Implement ui for failed state of apps in detail screen * Add failure alert support into appManage * Show validation erros/warnings on app detail page * Add status column to apps template * Update uninstall modal * Notify admins of disabled apps with valid licenses
* Add option to change cancel button color on modal * Avoid an extra modal when uninstalling subscribed app
Co-Authored-By: Diego Sampaio <chinello@gmail.com>
|
|
rodrigok
approved these changes
Aug 2, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
2019-08-02 · 9 🎉 · 6 🚀 · 31 🐛 · 31 🔍 · 29 👩💻👨💻Engine versions
8.11.46.4.13.2, 3.4, 3.6, 4.0🎉 New features
🚀 Improvements
🐛 Bug fixes
getUsersOfRoomnot returning offline users if limit is not defined (#14753)🔍 Minor changes
👩💻👨💻 Contributors 😍
👩💻👨💻 Core Team 🤓