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 #116

Merged
merged 24 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cb0695c
[FIX] Issues on Custom Livechat messages (#648)
murtaza98 Oct 20, 2021
cb24408
[FIX] 'Hide agent info' not working on system message (#651)
murtaza98 Oct 20, 2021
14c4d17
add callnotification,callStartmsg,iframe code (#617)
Deepak-learner Jul 22, 2021
a02f241
add joinCallBtn, endCall message, callRing functionalities. (#618)
Deepak-learner Aug 9, 2021
b52f484
[NEW] Handle endCall and expandView control buttons (#633)
dhruvjain99 Aug 17, 2021
853399d
[FIX] Notify agent on call decline (#634)
dhruvjain99 Aug 17, 2021
5820ea5
[NEW] WebRTC-call in new tab for mobile devices (#629)
Deepak-learner Aug 19, 2021
2d2ca32
[NEW] add-jitsi-call-support
murtaza98 Sep 14, 2021
2150c96
Improve overall codebase
murtaza98 Sep 20, 2021
c0962e8
update Rocket.Chat.js.SDK version to 1.0.0-alpha.42
murtaza98 Oct 18, 2021
8daee44
Fix Join call button layout
murtaza98 Oct 18, 2021
d134a28
Fix typo
murtaza98 Oct 18, 2021
6993764
Apply review suggestions
murtaza98 Nov 18, 2021
747142f
Refactor Call Statuses to remove redundancy
murtaza98 Nov 18, 2021
f08bd01
Rename endTs property on Message to webRtcCallEndTs
murtaza98 Nov 19, 2021
b65502e
Merge pull request #646 from RocketChat/livechat-calls-fix-conflicts
KevLehman Nov 19, 2021
66c7a13
Fixes #572 - Body styles getting overridden (#660)
murtaza98 Nov 19, 2021
f7c3363
[FIX] Undo Css changes (#661)
murtaza98 Nov 19, 2021
760fcf5
[FIX] LoadConfig after registering guest (#640)
hanoii Nov 19, 2021
a53d88c
Merge branch 'develop' into develop-catchup-760fcf5
Shailesh351 Nov 29, 2021
0e505f3
Update build files
Shailesh351 Nov 29, 2021
a0bfa23
Update build files
Shailesh351 Dec 6, 2021
06f02c4
Merge branch 'develop' into develop-catchup-760fcf5
Shailesh351 Dec 8, 2021
615db4f
Update build files
Shailesh351 Dec 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .loki/reference/chrome_Components_Icons_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .loki/reference/chrome_Components_Icons_phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .loki/reference/chrome_Components_Icons_video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Leave_a_message_loading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Leave_a_message_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
173 changes: 0 additions & 173 deletions build/0.chunk.16385.js

This file was deleted.

1 change: 0 additions & 1 deletion build/0.chunk.16385.js.map

This file was deleted.

173 changes: 173 additions & 0 deletions build/0.chunk.3e006.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/0.chunk.3e006.js.map

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions build/61.chunk.04205.js

This file was deleted.

1 change: 0 additions & 1 deletion build/61.chunk.04205.js.map

This file was deleted.

3 changes: 0 additions & 3 deletions build/61.chunk.a8a84.css

This file was deleted.

Loading