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 |
|
Germain Souquet
|
9180d478eb
|
Prevent action bar to overlap the event content
|
2021-07-22 11:00:34 +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
|
8695beb7ca
|
Fix overflow issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 10:03:22 +02:00 |
|
Šimon Brandner
|
2873bf6c3c
|
Make feeds bit a smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:50:56 +02: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
|
72948b9167
|
Keep aspect ratio for voice feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:45:33 +02:00 |
|
Weblate
|
29b5454f71
|
Merge branch 'origin/develop' into Weblate.
|
2021-07-22 07:44:46 +00:00 |
|
Germain
|
51178735c9
|
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
|
2021-07-22 08:44:40 +01: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 |
|