forked from RocketChat/Rocket.Chat
-
Notifications
You must be signed in to change notification settings - Fork 1
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
[Upstream Catchup] Merge RC:master to develop_pwa #1216
Draft
ear-dev
wants to merge
647
commits into
develop_pwa
Choose a base branch
from
develop_pwa-catchup-0e38639
base: develop_pwa
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
* Added invalid password error message * Added new password error message Co-authored-by: dougfabris <devfabris@gmail.com>
Co-authored-by: Diego Sampaio <chinello@gmail.com>
…hat#25231) * Added MaxNickNameLength and MaxBioLength constants added above mentioned constants to remove magic numbers in a simple manner * code style fixes Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
* Replace shredder icon by stopwatch icon * stopwatch icon for otr msg * remove old otr css * remove some unnecessary files Co-authored-by: yash-rajpal <rajpal.yash03@gmail.com> Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
…ocketChat#25230) * Clickup Task: https://app.clickup.com/t/22rjza5 Description: The issue occurs because when client turns on VoIP, server starts the connector in apps/meteor/app/voip/server/startup.ts. While the AMI connection is not established, client makes a call to API api/v1/connector.extension.getRegistrationInfoByUserId?id=<userId>. This requires the connection to be up. But because the connection establishment is not yet complete, apps/meteor/server/services/voip/connector/asterisk/CommandHandler.ts thrown an error. Solution : In apps/meteor/app/voip/server/startup.ts add await for Voip.init(). Once the init is done (Which internally waits for socket establishment), broadcast connector.statuschanged with the setting value (Enabled = true/false) In apps/meteor/client/providers/CallProvider/hooks/useVoipClient.ts make voipEnabled as a setting. And change it in the event listener for voip.statuschanged * change place where event was fired Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
…t#25244) * fix: show read receipts with color gray instead of hidden * fix: rename function * review Co-authored-by: gabriellsh <gabriel.henriques@rocket.chat>
* Clickup Task: https://app.clickup.com/t/245c0d8 Description: Agent gets disconnected (or Unregistered) from asterisk in multiple ways. The goal is that agent should remain online unless agent explicitly logs off. Agent can stop receiving calls in multiple ways due to network loss. Network loss can happen in following ways. 1. User tries to switch the network. User experiences a glitch of disconnectivity. This can be simulated by turning the network off in the network tab of chrome's dev tool. This can disconnect the UA if the disconnection happens just before the registration refresh. 2. Second reason is when computer goes in sleep mode. 3. Third reason is that when asterisk is crashed/in maintenance mode/explicitly stopped. Solution: The idea is to detect the network disconnection and start the start the attempts to reconnect. The detection of the disconnection does not happen in case#1. The SIPUA's UserAgent transport does not call onDisconnected when network loss of such kind happens. To tackle this problem, window's online and offline event handlers are used. The number of retries is configurable but ideally it is to be kept at -1. Whenever disconnection happens, it should keep on trying to reconnect with increasing backoff time. This behaviour is useful when the asterisk is stopped. When the server is disconnected, it should be indicated on the phone button. * Clickup Task: https://app.clickup.com/t/245c0d8 Description: 1. Replaced complex state handling in OmnichannelCallToggleReady.tsx. This was creating lot of erros. Added simple network status check and the phone button displays the latest state of things. 2. Some files were overwriting the changes in develop branch. Replaced that with correct changes. * Clickup Task: https://app.clickup.com/t/245c0d8 Description: Adding semi-colon to fix error. * Clickup Task : https://app.clickup.com/t/245c0d8 Description : Fixing review commnts. * removing unused files * Clickup Task: https://app.clickup.com/t/245c0d8 Description: Renaming file to correct the spelling. Making necessary changes in index.ts * Clickup Task: https://app.clickup.com/t/245c0d8 Description: Fixing incorrect spelling. * Add description to setting Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
* WIP: OTR Room States * lint * remove logs * new OTR components, remove modals * updating stories * convert js files to ts * correct a type * add missing translation * fix review * chore: remove OTRModal * fix: review Co-authored-by: dougfabris <devfabris@gmail.com>
Co-authored-by: dougfabris <devfabris@gmail.com>
* feat: add katex render to message react * fix: add boolean to type * fix Review * fix: review Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> Co-authored-by: dougfabris <devfabris@gmail.com>
* fix: default margins for outer quote * fix: Removing condition to style differently the inner quote * fix: updating yarn.lock
* fix: rm intial 'total' from rooms & total groups * fix: change key of 'total messages' title * feat: cr8 'total_rooms'='Total Rooms' in en.i18n replace it from 'rooms' title in rooms group * fix: change pt-BR.i18n to remove initial 'total'
… networks (RocketChat#25618) * Change .race for .allsettled so rejections are handled better * improve to unstable check logic * CR suggestions
* fix: Click to join button Jitsi Call * Fix `yarn` references * fix: Old message Jitsi Button * Fix yarn references (again) * Update apps/meteor/app/action-links/client/lib/actionLinks.ts Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat> * fix: changing instance type Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
…RocketChat#25653) * Fix odd typechecking issues with JSON modules * Avoid `data` as directory for modules * rename other `data` folder Co-authored-by: gabriellsh <gabriel.henriques@rocket.chat>
…ocketChat#25683) * fix: prevent crashing when inviting someone as non-owner * chore: fix lint
Co-authored-by: Fábio Albuquerque <albuquerquefabio@icloud.com>
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.
Weekly Catchup PR to merge RC:master in develop_pwa.