-
Notifications
You must be signed in to change notification settings - Fork 10.9k
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
Chore: Merging develop to new/livechat-voip #23891
Merged
MartinSchoeler
merged 160 commits into
new/livechat-voip
from
livechat-voip/develop-merge
Dec 7, 2021
Merged
Chore: Merging develop to new/livechat-voip #23891
MartinSchoeler
merged 160 commits into
new/livechat-voip
from
livechat-voip/develop-merge
Dec 7, 2021
Conversation
This file contains 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
* check if user exists when accessing canViewAllInfo * Explicitly return null Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
…nc (#23378) Co-authored-by: Diego Sampaio <chinello@gmail.com>
Release 4.0.1
…rwarded chat is queued (#23404) * [FIX][EE] Omni agent is not leaving the room when a forwarded chat is queued * Apply suggestions from code review * Apply suggestions from code review
Release 4.0.2
…23473) * Prevent server crash when routing method is not valid * Change way of starting/stopping queue * Friday... * Fix PR comments * Update app/livechat/server/lib/RoutingManager.js Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com> Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
… in cluster (#23418) * Fix communication problem when updating apps in cluster * Fix app being removed in multi-instances env problem
Release 4.0.3
* Error handling on queue processing * add error handling to queue execution and lock timeout * add error handling to queue execution and lock timeout
* Remove roles update on insertOrUpdateSAMLUser * Check SAML Role Sync setting before updating users' roles * Add rolesSync variable * Add role sync event * Remove isEnterprise check * New code * Updated unit test for the new behavior Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>
Release 4.0.4
Merge master into develop & Set version to 4.3.0-develop
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
* [FIX] Add CSP to authorize auto-close of CAS login window * Update cors.js Co-authored-by: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
* Language update from LingoHub 🤖 Project Name: Rocket.Chat Project Link: https://translate.lingohub.com/rocketchat/dashboard/rocket-dot-chat User: Robot LingoHub Easy language translations with LingoHub 🚀 Co-authored-by: Diego Sampaio <chinello@gmail.com>
amolghode1981
changed the title
Chore : Merging develop to new/livechat-voip
Chore: Merging develop to new/livechat-voip
Dec 7, 2021
amolghode1981
changed the title
Chore: Merging develop to new/livechat-voip
Chore Merging develop to new/livechat-voip
Dec 7, 2021
KevLehman
changed the title
Chore Merging develop to new/livechat-voip
Chore: Merging develop to new/livechat-voip
Dec 7, 2021
This pull request introduces 1 alert and fixes 1 when merging 7abd408 into 38bb1ec - view on LGTM.com new alerts:
fixed alerts:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merged develop with new/livechat-voip. Most of the files were merged correctly. Following files had to be manually merged
The JS version of 2 and 3 were deleted and necessary code has been added to the corresponding ts/tsx file.
Issue(s)
Steps to test or reproduce
Following has been testesd
Further comments