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

Chore: Merging develop to new/livechat-voip #23891

Merged
merged 160 commits into from
Dec 7, 2021

Conversation

amolghode1981
Copy link
Contributor

@amolghode1981 amolghode1981 commented Dec 7, 2021

Merged develop with new/livechat-voip. Most of the files were merged correctly. Following files had to be manually merged

  1. package-lock.json
  2. client/sidebar/sections/Omnichannel.tsx
  3. ee/app/livechat-enterprise/server/permissions.ts
    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

  1. API responses.
  2. Working of Registe/unregister.
  3. Fetching of necessary extension information from the server.
  4. End to end call.

Further comments

rodrigok and others added 30 commits October 6, 2021 13:58
* 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>
…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
…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
* 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>
sampaiodiego and others added 16 commits November 30, 2021 09:04
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 amolghode1981 changed the title Chore : Merging develop to new/livechat-voip Chore: Merging develop to new/livechat-voip Dec 7, 2021
@amolghode1981 amolghode1981 changed the title Chore: Merging develop to new/livechat-voip Chore Merging develop to new/livechat-voip Dec 7, 2021
@KevLehman KevLehman changed the title Chore Merging develop to new/livechat-voip Chore: Merging develop to new/livechat-voip Dec 7, 2021
@lgtm-com
Copy link

lgtm-com bot commented Dec 7, 2021

This pull request introduces 1 alert and fixes 1 when merging 7abd408 into 38bb1ec - view on LGTM.com

new alerts:

  • 1 for Use of a weak cryptographic key

fixed alerts:

  • 1 for Use of a weak cryptographic key

@MartinSchoeler MartinSchoeler merged commit 8411de3 into new/livechat-voip Dec 7, 2021
@MartinSchoeler MartinSchoeler deleted the livechat-voip/develop-merge branch December 7, 2021 16:39
@MartinSchoeler MartinSchoeler restored the livechat-voip/develop-merge branch December 7, 2021 16:56
@MartinSchoeler MartinSchoeler deleted the livechat-voip/develop-merge branch December 7, 2021 17:01
@amolghode1981 amolghode1981 restored the livechat-voip/develop-merge branch December 7, 2021 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.