OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
36,535 Commits
203 Branches
553 Tags
457 MiB
Commit Graph

36535 Commits (f53eb4eeedc1e7c449d92956a1ecebdbd4d4affa)

Author SHA1 Message Date
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
Weblate 1d0f78191b Merge branch 'origin/develop' into Weblate. 2021-08-05 14:36:58 +00: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
Weblate 49434b4eb8 Merge branch 'origin/develop' into Weblate. 2021-08-05 14:34:36 +00: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
Weblate 2f5455f1c4 Merge branch 'origin/develop' into Weblate. 2021-08-05 11:45:48 +00:00
jelv 2b74ab13a3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3104 of 3104 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-05 11:45:48 +00:00
vicdorke a0e02ca543 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.4% (2964 of 3104 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-05 11:45:46 +00: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
Weblate 25b7a719a7 Merge branch 'origin/develop' into Weblate. 2021-08-05 08:33:56 +00: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
Weblate db1c5974dd Merge branch 'origin/develop' into Weblate. 2021-08-05 08:23:03 +00:00
Jeff Huang 6fe403fe8d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-08-05 08:23:03 +00:00
William Weber Berrutti bb6c331a66 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.1% (2827 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-08-05 08:23:01 +00:00
jelv 2b4a4ecfbb Translated using Weblate (Dutch) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-05 08:22:59 +00: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
Weblate e01aacd5fa Merge branch 'origin/develop' into Weblate. 2021-08-04 22:02:49 +00: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
Weblate cfd2db4e87 Merge branch 'origin/develop' into Weblate. 2021-08-04 21:38:14 +00:00
waclaw66 7cd7df33b2 Translated using Weblate (Czech) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-04 21:38:14 +00:00
Szimszon 22b3dfd0c5 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-08-04 21:38:12 +00: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
Weblate 9f61095466 Merge branch 'origin/develop' into Weblate. 2021-08-04 15:41:54 +00: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
Šimon Brandner e2bc76a129
Fix voice feed cut-off 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 17:17:21 +02:00
Šimon Brandner fe643b2401
Use flex-start as it has more universal support 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 17:09:48 +02:00
Weblate f9e44e2b14 Merge branch 'origin/develop' into Weblate. 2021-08-04 15:00:30 +00:00
waclaw66 04fb61f91e Translated using Weblate (Czech) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-04 15:00:30 +00: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
Weblate d4c4cc9239 Merge branch 'origin/develop' into Weblate. 2021-08-04 14:15:12 +00: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