Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
63,001 Commits 1 Branch 646 Tags
bb41616d5f9fc6d47c735d4794de1fa46766cb7a
Commit Graph

63001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Šimon Brandner 443db125a9 Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 14:36:55 +02: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
Šimon Brandner efeae3a84c Top align the avatar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 13:39:39 +02:00
Michael Telatynski a9d7d01014 Null guard space inviter to prevent the app exploding 2021-08-05 12:30:22 +01:00
Šimon Brandner 5fa6ef83d2 Fix button alighnment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 12:35:44 +02:00
Weblate 43d8d7a477 Merge branch 'origin/develop' into Weblate. 2021-08-05 10:19:08 +00:00
Nikita Epifanov a567b1d57f Translated using Weblate (Russian) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ru/
 2021-08-05 10:19:08 +00:00
Michael Telatynski 66c86697c1 Merge pull request #18407 from vector-im/t3chguy/fix/decoder-ring 
Fix the decoder-ring
 2021-08-05 11:19:03 +01:00
Michael Telatynski 6685ff0e79 Fix the decoder-ring 2021-08-05 11:10:50 +01:00
Šimon Brandner 9e4f5719a4 Handle narrow layouts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 11:47:58 +02: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
Weblate 1923e0cd34 Merge branch 'origin/develop' into Weblate. 2021-08-04 21:31:41 +00:00
Travis Ralston 7a2b60f276 Merge pull request #18395 from vector-im/travis/voice-messages/worklet 
Properly handle react-sdk's recorder worklet
 2021-08-04 15:31:37 -06:00
Travis Ralston e123b8bcc0 Appease Jest 2021-08-04 15:24:02 -06:00
Travis Ralston 9b32a1c609 Appease Jest 2021-08-04 15:23:35 -06:00
Travis Ralston d4fc3ed354 Properly handle react-sdk's recorder worklet 
Fixes https://github.com/vector-im/element-web/issues/18393
 2021-08-04 15:08:52 -06:00
Travis Ralston 4d5bdf70b7 Fix worklet reference for new webpack pipeline 2021-08-04 15:08:22 -06:00
Weblate 53c8e08dde Merge branch 'origin/develop' into Weblate. 2021-08-04 17:57:42 +00:00
David Baker aeca4df693 Merge pull request #18389 from vector-im/dbkr/move_issues_workflow 
Add github workflow to put issues tagged design on the design board
 2021-08-04 18:57:39 +01:00
Weblate cb9a8389ac Merge branch 'origin/develop' into Weblate. 2021-08-04 17:54:08 +00:00
David Baker 54620a2eb8 Fix org in codeowners 2021-08-04 18:53:50 +01:00
David Baker e9863f0719 Add github workflow to put issues tagged design on the design board 2021-08-04 18:50:09 +01: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