Commit graph

36149 commits

Author SHA1 Message Date
Robin Townsend
4ace2353e3 Merge branch 'develop' into regional-indicators 2021-08-05 17:41:37 -04:00
Travis Ralston
4dcf2c7038
Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281
Fix sizing issues of the screen picker
2021-08-05 15:39:12 -06:00
Travis Ralston
3b73c17465
Merge pull request #6181 from pvagner/voip-a11y
Make call control buttons accessible to screen reader users
2021-08-05 13:36:17 -06:00
Michael Telatynski
e9b1db6518
Merge pull request #6559 from matrix-org/t3chguy/fix/17906 2021-08-05 20:00:11 +01:00
Travis Ralston
b967465498
Merge pull request #6563 from matrix-org/travis/voice-messages/stop-playing
Stop voice messages that are playing when starting a recording
2021-08-05 12:56:44 -06:00
Travis Ralston
17a3dc5e6d Stop voice messages that are playing when starting a recording
Fixes https://github.com/vector-im/element-web/issues/18410
2021-08-05 12:44:12 -06:00
Travis Ralston
570c2b3292
Merge pull request #6561 from matrix-org/travis/fix-download-frame
Properly set style attribute on shared usercontent iframe
2021-08-05 11:27:31 -06:00
Travis Ralston
81ddaf2efa Properly set style attribute on shared usercontent iframe
Fixes https://github.com/vector-im/element-web/issues/18414
2021-08-05 11:21:22 -06:00
Andrew Morgan
df888a1886
Fix in-call context menus when in PiP mode (#6552)
Mounting them as children when in PiP mode doesn't work. Condition mounting
the context menus as children of the current component based on whether PiP
mode is active.
2021-08-05 16:33:22 +01:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Michael Telatynski
b860acca80 Extract tooltipYOffset to a const 2021-08-05 14:43:44 +01:00
Michael Telatynski
e1b62ae38b Increase yOffset by 4px away 2021-08-05 14:20:31 +01:00
Michael Telatynski
8ae95ddbb7 i18n 2021-08-05 13:50:50 +01:00
Michael Telatynski
a8b050a385 Post-merge conflict resolution and improve alignment of tooltips 2021-08-05 13:37:23 +01:00
Michael Telatynski
54509fae95 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/voip-a11y1
 Conflicts:
	src/components/views/voip/CallView.tsx
2021-08-05 13:24:16 +01:00
Michael Telatynski
980b284642 Fix image & blurhash info when skipping thumbnail due to thresholds 2021-08-05 13:12:01 +01:00
Michael Telatynski
99adbfd1ea Skip sending a thumbnail if it is not a sufficient saving over the original 2021-08-05 13:04:20 +01:00
Michael Telatynski
c7560a25e9
Merge pull request #6558 from matrix-org/t3chguy/null-guard-space-inviter 2021-08-05 12:45:40 +01:00
Michael Telatynski
a9d7d01014 Null guard space inviter to prevent the app exploding 2021-08-05 12:30:22 +01:00
Michael Telatynski
58575c335d
Merge pull request #5510 from SimonBrandner/feature-surround-with
Add surround with feature
2021-08-05 09:33:52 +01:00
Germain
b5a708127a
Merge pull request #6554 from robintown/pin-icon-seams
Remove seams from pin icon
2021-08-05 09:22:51 +01:00
Robin Townsend
5e3b79eeca Remove seams from pin icon
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 18:42:47 -04:00
Dariusz Niemczyk
7d06507a9c
Merge pull request #6534 from SimonBrandner/fix/ringing-sound/15591
Make the ringing sound mutable/disablable
2021-08-05 00:02:44 +02:00
Travis Ralston
b4b4fb9702
Merge pull request #6553 from matrix-org/travis/voice-messages/worklet
Fix worklet reference for new webpack pipeline
2021-08-04 15:38:04 -06:00
Travis Ralston
9b32a1c609 Appease Jest 2021-08-04 15:23:35 -06:00
Travis Ralston
4d5bdf70b7 Fix worklet reference for new webpack pipeline 2021-08-04 15:08:22 -06:00
Šimon Brandner
b9b98c6a81
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 18:15:11 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Šimon Brandner
ee500ad684
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 18:14:32 +02:00
Germain
7b8a43bd2b
Merge pull request #6551 from SimonBrandner/fix/pip-cursor/18383
Fix wrong cursor being used in PiP
2021-08-04 16:41:49 +01:00
Šimon Brandner
91b4b50969
Fix wrong cursor being used in PiP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:25:12 +02:00
Germain
724c67bc21
Merge pull request #6548 from robintown/fix-fallback-fonts
Fix fallback fonts
2021-08-04 16:00:22 +01:00
Šimon Brandner
74e1342fa8
Wrap cases in {}
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:35:46 +02:00
Šimon Brandner
023d874949
Add missing ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:34:59 +02:00
Šimon Brandner
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:30:03 +02:00
Šimon Brandner
79e4a95b13
Move stuff out of if statement for better readability
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:25:44 +02:00
Germain
4dda4b241a
Merge pull request #6542 from matrix-org/gsouquet/fix-18354
Fix right margin for events on IRC layout
2021-08-04 15:15:06 +01:00
Dariusz Niemczyk
dc88686f9d
Merge pull request #6539 from SimonBrandner/feature/increase-anim-speed/18371
Increase PiP snapping speed
2021-08-04 16:02:47 +02:00
Dariusz Niemczyk
139a4028a3
Merge pull request #6545 from SimonBrandner/feature/update-tile-copy/18376
Improve call event tile wording
2021-08-04 15:55:26 +02:00
Šimon Brandner
a04a8006fc
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 15:48:53 +02:00
Dariusz Niemczyk
c848b8f486
Merge pull request #6524 from matrix-org/palid/feature-css/hmr
Add data-mx-theme to theme css for hot-reload
2021-08-04 15:35:15 +02:00
Robin Townsend
5877e936c0 Fix fallback fonts
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 09:24:18 -04:00
David Baker
9845dcb08c
Merge pull request #6546 from matrix-org/dbkr/codeowners
Add CODEOWNERS
2021-08-04 14:22:56 +01:00
David Baker
a5b43ca7ca
Merge pull request #6226 from SimonBrandner/feature/re-pin-jitsi/17679
Re-pin Jitsi if the widget already exists
2021-08-04 14:01:13 +01:00
David Baker
d0b295f1a7 Add CODEOWNERS 2021-08-04 13:28:31 +01:00
Šimon Brandner
f97f410d09
Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:16:01 +02:00
Šimon Brandner
9681e0e441
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:15:20 +02:00
David Baker
972e34516d
Merge pull request #6544 from matrix-org/dbkr/use_node_14
Declare node 14 requirement
2021-08-04 12:13:08 +01:00
Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 13:11:36 +02:00