Commit graph

35809 commits

Author SHA1 Message Date
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
Šimon Brandner
2841383e82
rethemendex
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:10:57 +02:00
Germain Souquet
224a9db3ec Add event selected state for message bubbles 2021-07-22 16:48:55 +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
a61cce7848 Merge branch 'origin/develop' into Weblate. 2021-07-22 14:12:14 +00:00
Germain
09186f8ee9
Merge pull request #6446 from matrix-org/gsouquet/fix-18145
Always display the Sender in the reply tile
2021-07-22 15:12:09 +01:00
Weblate
7f44eddac5 Merge branch 'origin/develop' into Weblate. 2021-07-22 14:11:32 +00:00
Germain
324037298a
Merge pull request #6447 from matrix-org/gsouquet/fix-18176
Use modern layout in file and notification panel
2021-07-22 15:11:27 +01: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
c06609d0f2 Merge branch 'origin/develop' into Weblate. 2021-07-22 13:28:17 +00:00
Germain
78ae4ebc1e
Merge pull request #6444 from matrix-org/gsouquet/fix-18121
Add right padding for event replies
2021-07-22 14:28:13 +01:00
Weblate
ddfc33487d Merge branch 'origin/develop' into Weblate. 2021-07-22 13:28:10 +00:00
Germain
f9e8e66ac6
Merge pull request #6445 from matrix-org/gsouquet/fix-18127
Fix event tile cut off in share preview
2021-07-22 14:28:06 +01: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
817482700c
Merge pull request #6443 from matrix-org/gsouquet/fix-18178
Remove excessive padding after url previews
2021-07-22 14:27:38 +01:00
Germain Souquet
229d139568 Always display the Sender in the reply tile 2021-07-22 15:23:08 +02:00
Germain Souquet
8a9d89ae85 Fix event tile cut off in share preview 2021-07-22 15:05:44 +02:00
Germain Souquet
2e173d7810 Add right padding for event replies 2021-07-22 14:38:57 +02: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
68a31e0dd4 Merge branch 'origin/develop' into Weblate. 2021-07-22 11:20:31 +00:00
Michael Telatynski
88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes 2021-07-22 12:20:27 +01:00
Weblate
3e54db9b34 Merge branch 'origin/develop' into Weblate. 2021-07-22 11:14:33 +00:00
Germain
951ceb194c
Merge pull request #6438 from matrix-org/gsouquet/fix-18074
Prevent action bar to overlap the event content
2021-07-22 12:14:29 +01:00
Šimon Brandner
6ae320831a
Make quotes thinner
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
Weblate
976a21e883 Merge branch 'origin/develop' into Weblate. 2021-07-22 10:22:27 +00:00
Travis Ralston
f4a43cd3d3
Merge pull request #6436 from matrix-org/travis/voice-messages/large
Use a MediaElementSourceAudioNode to process large audio files
2021-07-22 04:22:23 -06:00
Travis Ralston
6b54f83b08 Merge branch 'develop' into travis/voice-messages/large 2021-07-22 04:16:53 -06:00
Weblate
596ef36ddf Merge branch 'origin/develop' into Weblate. 2021-07-22 09:49:15 +00:00
Travis Ralston
c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
Šimon Brandner
85e08d5074
Revert 100%
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02: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