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

[Upstream Catchup] Merge Rocket.chat.Livechat:develop to develop (v1.12.0) #125

Merged
merged 44 commits into from Jan 25, 2022

Conversation

ear-dev
Copy link

@ear-dev ear-dev commented Jan 24, 2022

Weekly Catchup PR to merge Rocket.chat.Livechat:develop in develop.

Part of WideChat/Rocket.Chat#1055

KevLehman and others added 30 commits September 14, 2021 15:55
Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
* Full Spanish translation

* Update es.json

corrected: "invalid_email_e82f3682"

Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
Added some translations

Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
* new steps to run your local widget correctly

* remove screenshot from repository

* Update README.md

Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
* 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
* 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
* 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>
add joinCallBtn, endCall message, callRing functionalities. (RocketChat#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 (RocketChat#633)

* [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>
[FIX] Notify agent on call decline (RocketChat#634)

[NEW] WebRTC-call in new tab for mobile devices (RocketChat#629)

* 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>
[NEW] add-jitsi-call-support

Co-Authored-By: Deepak Agarwal <56799414+Deepak-learner@users.noreply.github.com>

Improve overall codebase

- Define an enum like structure for call statuses
- Fix formatting and spelling issues
- General refactoring

update Rocket.Chat.js.SDK version to 1.0.0-alpha.42

Fix Join call button layout

Fix typo

Apply review suggestions

- Use date-fns library to calculate call duration

Refactor Call Statuses to remove redundancy

Rename endTs property on Message to webRtcCallEndTs
…tChat#666)

Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
…tChat#666)

Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
* Hide Livechat if omnichannel is disabled (RocketChat#671)

* Release 1.11.1

Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
* parse when submit only

* fix storybook
Copy link
Collaborator

@Shailesh351 Shailesh351 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@Shailesh351
Copy link
Collaborator

@ear-dev This PR looks good. Can you please merge it? Thanks!!

@ear-dev ear-dev merged commit 30fd3c3 into develop Jan 25, 2022
@Shailesh351 Shailesh351 changed the title [Upstream Catchup] Merge Rocket.chat.Livechat:develop to develop [Upstream Catchup] Merge Rocket.chat.Livechat:develop to develop (v1.12.0) Jan 25, 2022
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.

None yet