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

36726 commits

This branch
This branch
All branches
Author SHA1 Message Date
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:45:17 +02:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:43:19 +02:00
Weblate
b2be794bfe Merge branch 'origin/develop' into Weblate. 2021-08-05 22:02:05 +00:00
Travis Ralston
7c1d9b4eda
Merge pull request #6490 from robintown/regional-indicators 
Add regional indicators to emoji picker
 2021-08-05 16:02:00 -06:00
Robin Townsend
fef2d408f6 Add comments to isRegionalIndicator 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-08-05 17:56:16 -04:00
Weblate
c879698bcc Merge branch 'origin/develop' into Weblate. 2021-08-05 21:46:46 +00:00
Travis Ralston
27d7daeceb
Merge pull request #6550 from SimonBrandner/fix/voice-cutoff 
Fix voice feed being cut-off
 2021-08-05 15:46:42 -06:00
Weblate
ea2bcfb86a Merge branch 'origin/develop' into Weblate. 2021-08-05 21:46:16 +00:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start 
Use `flex-start` instead of `start`
 2021-08-05 15:46:12 -06:00
Robin Townsend
4ace2353e3 Merge branch 'develop' into regional-indicators 2021-08-05 17:41:37 -04:00
Weblate
baeace1ee3 Merge branch 'origin/develop' into Weblate. 2021-08-05 21:39:20 +00:00
waclaw66
5194f44370 Translated using Weblate (Czech) 
Currently translated at 100.0% (3113 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-05 21:39:20 +00: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
Weblate
c8d34e1624 Merge branch 'origin/develop' into Weblate. 2021-08-05 19:36:22 +00: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
Weblate
09b1ee5505 Merge branch 'origin/develop' into Weblate. 2021-08-05 19:00:15 +00:00
Michael Telatynski
e9b1db6518
Merge pull request #6559 from matrix-org/t3chguy/fix/17906 2021-08-05 20:00:11 +01:00
Weblate
a941f5a574 Merge branch 'origin/develop' into Weblate. 2021-08-05 18:56:52 +00:00
waclaw66
f751bcd690 Translated using Weblate (Czech) 
Currently translated at 100.0% (3102 of 3102 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-05 18:56:52 +00: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
fea30e5f5f Fix disabled state for voice messages + send button tooltip 
Fixes https://github.com/vector-im/element-web/issues/18413
 2021-08-05 12:38:15 -06:00
Weblate
8f8ab213c4 Merge branch 'origin/develop' into Weblate. 2021-08-05 17:27:36 +00: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
Weblate
66c5b857a6 Merge branch 'origin/develop' into Weblate. 2021-08-05 15:33:26 +00: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
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