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

28421 commits

Author SHA1 Message Date
iaiz
8b511bf989 Translated using Weblate (Spanish) 
Currently translated at 99.5% (3036 of 3049 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-07-22 21:56:09 +00:00
David Baker
d38f2cf5b5 Fix display of image messages that lack thumbnails 
Fixes https://github.com/vector-im/element-web/issues/18175
 2021-07-22 22:49:30 +01:00
Travis Ralston
c427612c24 de-dupe audio player 
Fixes https://github.com/vector-im/element-web/issues/18161
 2021-07-22 12:14:38 -06:00
Travis Ralston
e1bb04f45a Remove answered TODOs 2021-07-22 09:27:38 -06:00
Travis Ralston
eec63574e6 Move src/voice to src/audio for better naming 
Many of these files are used by Audio and Voice messages.

Fixes https://github.com/vector-im/element-web/issues/18131
 2021-07-22 09:26:26 -06:00
Weblate
361e03604f Merge branch 'origin/develop' into Weblate. 2021-07-22 15:16:38 +00:00
Germain
248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142 
Fix avatar obstructing membership and state changes
 2021-07-22 16:16:33 +01:00
Weblate
85f10698df Merge branch 'origin/develop' into Weblate. 2021-07-22 14:22:11 +00:00
Germain
6765bb8f4c
Merge pull request #6418 from robintown/zoom-to-cursor 2021-07-22 15:22:04 +01:00
Weblate
7f44eddac5 Merge branch 'origin/develop' into Weblate. 2021-07-22 14:11:32 +00:00
Germain Souquet
472ead41fb Make images fit inside message bubble 2021-07-22 16:05:09 +02:00
Germain Souquet
02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Robin Townsend
5d4b293e0a Add comment about modulo operator 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:56:26 -04:00
Robin Townsend
9e0720a6c4 Rename zoom anchor variables for clarity 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:48:56 -04:00
Robin Townsend
875b46bacb Don't zoom images when the cursor isn't over the image 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:46:29 -04:00
Robin Townsend
b99a6a8d54 Use typeof to check for presence of parameters 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:41:39 -04:00
Robin Townsend
3bf742f7aa Merge branch 'develop' into zoom-to-cursor 2021-07-22 09:39:52 -04:00
Weblate
5dc6711cb5 Merge branch 'origin/develop' into Weblate. 2021-07-22 13:27:47 +00:00
libexus
2b0a2d4ce8 Translated using Weblate (German) 
Currently translated at 99.0% (3021 of 3049 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-22 13:27:47 +00:00
Germain Souquet
552770c15a Remove excessive padding after url previews 2021-07-22 14:24:49 +02:00
Michael Telatynski
18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-07-22 12:44:27 +01:00
Weblate
976a21e883 Merge branch 'origin/develop' into Weblate. 2021-07-22 10:22:27 +00:00
Travis Ralston
6b54f83b08 Merge branch 'develop' into travis/voice-messages/large 2021-07-22 04:16:53 -06:00
Weblate
8e0150a61c Merge branch 'origin/develop' into Weblate. 2021-07-22 09:40:47 +00:00
Travis Ralston
b3d14de181
Merge pull request #6435 from matrix-org/travis/voice-messages/duration 
Fix duration placeholder parsing for audio files
 2021-07-22 03:40:43 -06:00
Weblate
c49ca57371 Merge branch 'origin/develop' into Weblate. 2021-07-22 09:40:30 +00:00
Travis Ralston
0bb0c8105d
Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed 
Handle upload errors in voice messages
 2021-07-22 03:40:26 -06:00
Weblate
f5c8e8e9fc Merge branch 'origin/develop' into Weblate. 2021-07-22 09:39:51 +00:00
Travis Ralston
98472b4fce
Merge pull request #6433 from matrix-org/travis/voice-messages/errors 
Render error state for audio components
 2021-07-22 03:39:47 -06:00
Weblate
e040060621 Merge branch 'origin/develop' into Weblate. 2021-07-22 09:39:33 +00:00
Travis Ralston
b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours 
Clean up visual style of files and voice messages
 2021-07-22 03:39:29 -06:00
Germain Souquet
8da2d0fe72 Fix avatar obstructing membership and state changes 2021-07-22 11:31:46 +02: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
Weblate
ac3f0be8f7 Merge branch 'origin/develop' into Weblate. 2021-07-22 08:35:45 +00:00
Michael Telatynski
e665e38b7b
Merge pull request #6413 from SimonBrandner/ts/address-stuff 2021-07-22 09:35:40 +01:00
Šimon Brandner
adc177b28f
Fix a naming nit 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-22 10:30:12 +02:00
Weblate
729e6dd3d8 Merge branch 'origin/develop' into Weblate. 2021-07-22 08:23:00 +00:00
Michael Telatynski
9219661d7c
Merge pull request #5389 from matrix-org/t3chguy/fix/15536 
Fix onPaste handler to work with copying files from Finder
 2021-07-22 09:22:55 +01: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
Weblate
1c2a749cc0 Merge branch 'origin/develop' into Weblate. 2021-07-22 04:19:02 +00:00
XoseM
c36e135506 Translated using Weblate (Galician) 
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-22 04:19:02 +00:00
Jaiwanth
517e8951ee Apply suggestions from review 2021-07-22 08:30:18 +05:30
Jaiwanth
76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
Weblate
6e655b3d16 Merge branch 'origin/develop' into Weblate. 2021-07-22 02:38:53 +00:00
Jeff Huang
2bb80a2793 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-22 02:38:53 +00:00
Travis Ralston
05353d0fe5
Merge pull request #6388 from aaronraimist/matrix-url-permitted 
Add matrix: to the list of permitted URL schemes
 2021-07-21 20:38:45 -06:00
Weblate
cfe267a186 Merge branch 'origin/develop' into Weblate. 2021-07-22 01:44:09 +00:00
Travis Ralston
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps 
Add alwaysShowTimestamps and others to RoomView setting watchers
 2021-07-21 19:44:04 -06:00
Travis Ralston
c53ed5be2e Use a MediaElementSourceAudioNode to process large audio files 
Fixes https://github.com/vector-im/element-web/issues/18149

See comment block contained within diff.
 2021-07-21 17:53:49 -06:00
Travis Ralston
2addca1ca4 Fix duration placeholder parsing for audio files 2021-07-21 17:09:34 -06:00
Travis Ralston
079e75aae9 Handle upload errors in voice messages 
Fixes https://github.com/vector-im/element-web/issues/17148

Mostly adding some try/catch blocks, and a generic dialog.
 2021-07-21 16:11:10 -06:00
Travis Ralston
3d72b9e227 Render error state for audio components 
Fixes https://github.com/vector-im/element-web/issues/17148

Both `AudioPlayer` and `RecordingPlayback` got a fragment added to their DOM structure, to incorporate the rarely seen error message below it. Additionally, a missing try/catch was added to the `Playback` class to handle uncaught decoding issues.

The similarity of the components is tracked in https://github.com/vector-im/element-web/issues/18161
 2021-07-21 15:47:52 -06:00
Travis Ralston
3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06: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
Weblate
ddea1461a7 Merge branch 'origin/develop' into Weblate. 2021-07-21 19:07:28 +00:00
Travis Ralston
36d4eb85e1 Restore 'use default' naming on room notifications 
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
 2021-07-21 13:01:19 -06:00
Šimon Brandner
34f3e62f72
Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 20:48:50 +02:00
James Salter
c34afdb4bd Refactor platform properties loading 2021-07-21 18:35:25 +01:00
James Salter
585b702652 Add tip about shasum 2021-07-21 18:25:05 +01:00
James Salter
0c89eb51d4 add registerSuperProperties 2021-07-21 18:24:14 +01: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
Weblate
36c66fe279 Merge branch 'origin/develop' into Weblate. 2021-07-21 16:17:55 +00:00
Germain
0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01: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
James Salter
e9e0e4847f Move Welcome.js to tsx 2021-07-21 17:02:14 +01:00
James Salter
b380a89ac6 Fix wrong overriden attribute 2021-07-21 17:01:45 +01:00
Weblate
20edfc9c25 Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:28 +00:00
James Salter
f358deb6c4 Manually track page views 2021-07-21 16:52:57 +01: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
David Baker
a6c432d66f fix types 
in varyingly hacky ways
 2021-07-21 16:39:41 +01:00
James Salter
93962c0aca Update reasoning around disabling capture_pageview 2021-07-21 16:29:11 +01:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
James Salter
34f8c60b34 Hook analytics into the SDK 2021-07-21 16:15:18 +01: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
James Salter
53b6749f73 Change onboarding_login_begin to welcome_screen_load 2021-07-21 16:09:22 +01:00
James Salter
5697eeaab8 Put back accidentally removed anonymity update 2021-07-21 16:08:00 +01:00
James Salter
726b4497b2 Remove redactedCurrentLocation and rely on posthog for DNT 
* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog
 2021-07-21 16:06:09 +01:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +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
Weblate
0a064b89e5 Merge branch 'origin/develop' into Weblate. 2021-07-21 14:12:02 +00:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120 
Improve new layout switcher UI
 2021-07-21 15:11:58 +01:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +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
Weblate
0ccde3dfbb Merge branch 'origin/develop' into Weblate. 2021-07-21 13:58:52 +00:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1 
Play only one audio file at a time
 2021-07-21 07:58:46 -06:00
James Salter
4c6b0d35ad Improve analytics interface 
* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance
 2021-07-21 14:58:43 +01:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02:00
Weblate
77e095c10a Merge branch 'origin/develop' into Weblate. 2021-07-21 13:38:56 +00:00
jelv
2c370325b7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-21 13:38:55 +00:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 15:33:06 +02:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
James Salter
6da3cc8ca1 Redact sensitive data 2021-07-21 13:48:10 +01:00
Weblate
67f24b55c9 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:47 +00:00
libexus
3292374ac0 Translated using Weblate (German) 
Currently translated at 98.9% (3013 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 10:54:38 +00:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Weblate
99bc204669 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:30:26 +00:00
Besnik Bleta
4c82f161c3 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3038 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-21 10:30:26 +00:00
Michael Telatynski
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions 2021-07-21 11:30:15 +01:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
James Salter
7e549f84e7 Don't make getAnalytics the default export, its weird 2021-07-21 11:23:55 +01:00
James Salter
d9594c428a login event should be IAnonymousEvent 2021-07-21 11:23:42 +01:00
James Salter
678474c0e8 Fix missing underscore 2021-07-21 11:23:18 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Michael Telatynski
a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Weblate
2706e29579 Merge branch 'origin/develop' into Weblate. 2021-07-21 08:43:20 +00:00
Germain
b31b8f1b41
Remove old container sizing comment 
Co-authored-by: James Salter <jamess@element.io>
 2021-07-21 09:13:12 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
James Salter
b5564a0de0 Add getAnalytics helper 2021-07-21 08:42:29 +01:00
James Salter
4b0cb409a0 Add identifyUser 2021-07-21 08:38:58 +01:00
Weblate
430df6d083 Merge branch 'origin/develop' into Weblate. 2021-07-21 07:36:13 +00:00
Germain Souquet
54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
James Salter
74b0e52f9a Enforce anon/pseudo-anon via types 2021-07-21 08:23:42 +01:00
Robin Townsend
1d1d93ed14 Apply code review suggestion 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 03:17:55 -04:00
Priit Jõerüüt
4c00b807c2 Translated using Weblate (Estonian) 
Currently translated at 99.3% (3025 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-21 06:55:16 +00:00
XoseM
e9ee55ceb3 Translated using Weblate (Galician) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-21 06:55:13 +00:00
Jeff Huang
5f29fa55bb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-21 06:55:08 +00:00
libexus
6e6a227b13 Translated using Weblate (German) 
Currently translated at 98.9% (3012 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:55:03 +00:00
James Salter
d4550c1a28 Remove console logging 2021-07-21 07:42:44 +01:00
Robin Townsend
0497e0864f Fix types 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:42:30 -04:00
James Salter
2a48d3c9bc First pass at a PosthogAnalytics class 2021-07-21 07:40:39 +01:00
Robin Townsend
3911666c52 Zoom images to where the cursor points 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:25:34 -04:00
libexus
d80c6b6f25 Translated using Weblate (German) 
Currently translated at 98.6% (3003 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:02:27 +00:00
René-Maximilian Malsky
925d24b5d6 Translated using Weblate (German) 
Currently translated at 98.6% (3003 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:02:27 +00:00
René-Maximilian Malsky
e56cded8b6 Translated using Weblate (German) 
Currently translated at 98.5% (3002 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:00:16 +00:00
Travis Ralston
45f9f3e13e Name functions better 2021-07-20 23:34:27 -06:00
Travis Ralston
a759d61ba0 Play only one audio file at a time 
Fixes https://github.com/vector-im/element-web/issues/17439
 2021-07-20 23:28:07 -06:00
Robin Townsend
aefdac1115 Fix error when hovering over non-emoji reactions 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-20 22:41:49 -04:00
Šimon Brandner
e45b1a1e41
Missing license header 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 18:52:02 +02:00
Šimon Brandner
862932cce5
Don't use require 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 18:48:18 +02:00
Germain
3372a77248
Remove grecaptcha from globals thanks to #6412 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-20 17:45:47 +01:00
Germain Souquet
efce2d16f1 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 18:43:08 +02:00
Germain
745a8d3860
Explain isSmall proper for CountryDropdown 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-20 17:18:33 +01:00
Weblate
c47ff9189c Merge branch 'origin/develop' into Weblate. 2021-07-20 15:38:24 +00:00
Šimon Brandner
9fb872cade
Sort feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:34:47 +02:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition 
* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
 2021-07-20 17:33:05 +02:00
Weblate
bf4239b3e6 Merge branch 'origin/develop' into Weblate. 2021-07-20 15:08:57 +00:00
Ihor Hordiichuk
d77842d497 Translated using Weblate (Ukrainian) 
Currently translated at 47.0% (1431 of 3044 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-07-20 15:08:57 +00: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
Travis Ralston
7892539a9b delint 2021-07-20 09:03:26 -06: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
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00