Commit graph

28456 commits

Author SHA1 Message Date
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
Germain Souquet
0768f03097 Migrate ViewSourceEvent to TypeScript 2021-07-22 17:11:23 +02: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