Commit graph

79 commits

Author SHA1 Message Date
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Šimon Brandner
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Šimon Brandner
a933e08e5f
Also turn off camera when hiding sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 18:13:28 +02:00
Šimon Brandner
60ab7aaed5
Support hiding sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:20:13 +02:00
Šimon Brandner
10e8a1db58
Allow fullscreening in all call types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:15:17 +02:00
Šimon Brandner
6d29c19804
Move call controls into a separate method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 16:32:01 +02:00
Šimon Brandner
9a67851479
Hide feeds with muted video in certain cases and fix colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 14:01:09 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
Šimon Brandner
176fb9baae
Don't show sidebar in PiP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:03:14 +02:00
Šimon Brandner
84070bf0ca
Rework how feeds work
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 09:19:58 +02:00
Šimon Brandner
97b976b171
Adjust for sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:15:26 +02:00
Šimon Brandner
adddb0f0d2
Show screensharign button only if connected
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-13 18:11:47 +02:00
Šimon Brandner
834579f778
Don't render any audio non-primary feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 13:07:30 +02:00
Šimon Brandner
acd0fa4c0e
Add a comment about when it is possible to screenshare
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 14:42:06 +02:00
Šimon Brandner
90f4ad7a83
Always sort feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:21:02 +02:00
Šimon Brandner
69b0425c10
Improve and fix sorting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 18:50:13 +02:00
Šimon Brandner
4c9d9dd214
Enable screenshare in all video calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 10:04:26 +02:00
Šimon Brandner
5b2f941ce2
Add button to screenshare
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:35:32 +02:00
Šimon Brandner
1f27354439
Add support for up to 4 feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:34:56 +02:00
Šimon Brandner
0851cf4415
Simplifie things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:16:08 +02:00
Šimon Brandner
7042eb38dd
Listen for mouseup on the document
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 08:12:54 +02:00
Šimon Brandner
51e80dd172
Remove onMoving listner from CallView
This is not necessary since we already listen for it in CallPreview

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 07:50:21 +02:00
Šimon Brandner
241e626e96
Don't listen for onMouseLeave
This would cause problems because the moving element wouldn't catch up with the user

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 20:55:05 +02:00
Šimon Brandner
8948c7419c
Call dragCallbacks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:24:47 +02:00
Šimon Brandner
bebcb32e8f
Add dragCallbacks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:23:35 +02:00
Šimon Brandner
4c58a95046
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:59:47 +02:00
Šimon Brandner
8d014b7fa2
Use getLocalFeeds() for better clarity
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:23:21 +02:00
Šimon Brandner
e367725cce
Fix casing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:46 +02:00
Šimon Brandner
a6ad574f4e
Fix typos
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:21 +02:00
Šimon Brandner
81164fe152
Add comment about the js-sdk and new incoming feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 16:09:21 +02:00
David Baker
59c5ab31de Support MSC3086 asserted identity 2021-04-19 20:30:51 +01:00
Šimon Brandner
758112dda9
Add missing somicolons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 07:42:32 +02:00
Šimon Brandner
2cfd4659e1
Add separate mx_CallView_content class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-16 12:50:23 +02:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view 2021-04-04 11:35:26 +02:00
Šimon Brandner
16e6f84f89
Display local feeds when connecting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 09:04:17 +02:00
Šimon Brandner
9324dec0d6
Rename audioOnly to videoMuted
This makes more sense and will match a possible mute events MSC

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:50:25 +02:00
Šimon Brandner
4c64dacba4
Fix class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:16:08 +02:00
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:15:55 +02:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Šimon Brandner
431a2c033d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:13:40 +01:00
Šimon Brandner
787a62846e
Merge branch 'develop' into resizable-call-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-16 07:55:56 +01:00
Šimon Brandner
bb13dc49a6
Make CallView use CallFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 12:18:57 +01:00
Šimon Brandner
62e9d7f46b
Cleaner imports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 09:24:47 +01:00
Travis Ralston
41576954fd Batch of views getting replaceableComponent decorators 2021-03-08 20:23:54 -07:00