mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 15:42:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
36012 commits 219 branches 562 tags 474 MiB
Commit graph

275 commits

Author SHA1 Message Date
Šimon Brandner
65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-03 16:06:12 +02:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting 
Show an avatar/a turned off microphone icon for muted users
 2021-08-02 17:20:55 +01:00
Šimon Brandner
0c30566cae
Fix import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-30 08:20:36 +02:00
Šimon Brandner
e0df785538
Mirror only usermedia feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-30 08:15:45 +02:00
Andrew Morgan
a7c15b2ac0
Fix DialPad and Call Menu buttons not working when a call is fullscreened. (#6496) 
This PR:
* Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd.
* Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content).

<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->

<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->

`Signed-off-by: Andrew Morgan <andrewm@element.io>`
 2021-07-29 17:51:27 +01:00
Šimon Brandner
871f1b7a5c
Handle all possible playMedia() in componentDidUpdate() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:31:25 +02:00
Šimon Brandner
38a1b922bd
Add missing await 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:26:04 +02:00
Šimon Brandner
cb89dd408c
Use mic mute icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:05:26 +02:00
Šimon Brandner
cf973cdb95
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-29 09:06:24 +02:00
Šimon Brandner
ae64765870
playMedia only if necessary 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 08:45:32 +02:00
Šimon Brandner
537ce40f42
Add a TODO 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 16:32:55 +02:00
Šimon Brandner
7c4e3efbff
Extend PureComponent to avoid unnecessary renders 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 15:11:31 +02:00
Šimon Brandner
91e65534fa
await setState to avoid races where we would try to play media without an HTMLVideoElement 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 15:04:33 +02:00
Germain
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
Šimon Brandner
bc11e215b8
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 18:14:23 +02:00
Šimon Brandner
36607fa8a2
Fix call crashing because element was undefined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:05:50 +02:00
Šimon Brandner
6f77d3bbab
Correctly hide the dialpad 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 17:52:13 +02:00
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
Šimon Brandner
371de23b00
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
Šimon Brandner
b9e305daae
Delete mistake line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:26:46 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:25:38 +02:00
Šimon Brandner
f532c302b6
Don't animate when resizing and move when the PiP changes size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:31:54 +02:00
Šimon Brandner
001490f70d
Fix unused resize listener 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:30:44 +02:00
Šimon Brandner
5dd34de5fe
Handle mute state changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 14:31:42 +02:00
Šimon Brandner
3ef20174f3
Fix issues with the controls disappearing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 18:11:29 +02:00
Šimon Brandner
1754602613
Increase CONTROLS_HIDE_DELAY 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:30:59 +02:00
Šimon Brandner
03a8308ae8
Fix call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:24:18 +02:00
Šimon Brandner
a8d27746b4
Show dialpad only when PSTN supported 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:07:18 +02:00
Šimon Brandner
50c27ebed7
Add myself to the license header as I need to re-run the CI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:16:55 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:10:01 +02:00
Michael Telatynski
f5630acea7 Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
Šimon Brandner
f4287fc3ab
Simplifie sidebar showing logic 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 11:16:16 +02:00
Šimon Brandner
33abe83dad
Always hide all feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 10:39:00 +02:00
Šimon Brandner
89983820df
Fix dumb typo 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:49:37 +02:00
Šimon Brandner
6429b3c8bd
Only show toast about camera in video calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:23:37 +02:00
Šimon Brandner
37335b2c79
Show toast even for non-presenters 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:19:47 +02:00
Šimon Brandner
1b9b5fd048
Fix sidebar hiding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:14:44 +02:00
Šimon Brandner
c2aada6aa7
Clearer avatar sizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 21:27:07 +02:00
Šimon Brandner
9891eddcbd
Rename to toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:28:44 +02:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:22:47 +02:00
Šimon Brandner
3fac4adfc7
Fix feed sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:14:21 +02:00
Šimon Brandner
dc7f6d8286
Show sidebar in PiP mode 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:45:21 +02:00
Šimon Brandner
0a8067506f
Adjust hiding local feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:12:27 +02:00
Šimon Brandner
337664a1b4
Update sidebar behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:34:21 +02:00
Šimon Brandner
74649f1f92
Correct feed ordering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:21:52 +02:00
Šimon Brandner
2014517173
Always show screensharing feed as primary 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:20:09 +02:00
Šimon Brandner
51cf426179
Update the toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:08:18 +02:00
Šimon Brandner
9fb872cade
Sort feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:34:47 +02:00
Šimon Brandner
cfaf4b8078
Correct sidebar behaviour when muting local video 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:08:17 +02:00
Šimon Brandner
c7a28491ca
Correct sidebar toggle behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:58:44 +02:00