forked from RocketChat/Rocket.Chat.Livechat
-
Notifications
You must be signed in to change notification settings - Fork 5
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 Rocket.chat.Livechat:develop to develop #116
Merged
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
* Couple of fixes wrt custom messages - Fix offline success messages not working - Support HTML content on Offline message label * Support markdown data on Instructions panel * Update storybook
* Fix 'Hide agent info' not working on chat transfer message * Fix 'Hide agent info' setting not working on move chat to queue sytem msg * update storybook * Remove i18n fixes
* add callnotification,msg,iframe code * fix eslint issues * fix eslint file path issues * fix stylelint issues * done ui changes * add icons and improve ui * fix error * remove-icons * add icons * add i18n.t, change classname, improve ui * remove font-family * change iframe link * add check for jitsi * add jitsi link * add time message in system message and add catch * display alert, change function name * Improve overall codebase * Convert tabs to spaces for translation file * Accept jitsi url info from the message and remove dependency from Livechat.videoCall endpoint * Update index.js * add message in i18n file Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
…at#618) * add callnotification,msg,iframe code * fix eslint issues * fix eslint file path issues * fix stylelint issues * done ui changes * add join call button * add icons and improve ui * fix error * remove-icons * add icons * ui changes * add icon and timeout functionality * add I18n.t * add i18n.t, change classname, improve ui * remove font-family * change iframe link * add check for jitsi * add jitsi link * add time message in system message and add catch * display alert, change function name * Improve overall codebase * Convert tabs to spaces for translation file * Accept jitsi url info from the message and remove dependency from Livechat.videoCall endpoint * Update index.js * add message in i18n file * add joincall btn, call time, timeout * fix lint error * Update ShowJoinCallButton.js * fix conflicts * improve codebase * fix bugs * update some files * improve css, codebase and change condition * add correct link for iframe and joinCallBtn, show correct time * update call status at rc-core * update api file * rebase file * change link, use store class * update callIframe file * handle corner cases * remove file * Update room.js file Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com> * update one file * revert roomjs file * add common condition in room.js file Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
* [NEW] Handle endCall and expandView control buttons * [FIX] Lint errors * [FIX] Join Call Button giving call ended even when call inProgress * [FIX] slash omitted in the url * [REF] Remove redundant async keyword * [REF] Use spread operator, set ongoingCall status when expanding * [FIX] String enclosed within double quotes Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com> * [FIX] ongoingCall variable not destructured but used Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
* open webrtc call in new tab for mobile devices * improve codebase * add helper function * update one file * checking call status from room object * update one file * handle refresh case * change message filter condition Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Co-Authored-By: Deepak Agarwal <56799414+Deepak-learner@users.noreply.github.com>
- Define an enum like structure for call statuses - Fix formatting and spelling issues - General refactoring
- Use date-fns library to calculate call duration
…conflicts [NEW] Audio and Video calling in Livechat using WebRTC
* Fixes RocketChat#572 - Body styles getting overriden * Fix build
This was referenced Nov 23, 2021
Shailesh351
approved these changes
Dec 13, 2021
@Shailesh351 Thank you! |
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 Rocket.chat.Livechat:develop in develop.