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 |
|
Šimon Brandner
|
2df4f7b859
|
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
|
2021-07-22 07:51:58 +02:00 |
|
Šimon Brandner
|
9f227893b1
|
join -> jsxJoin
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 07:47:04 +02:00 |
|
Šimon Brandner
|
51c112fd82
|
PinnedMessages -> ChangedPins
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 07:46:41 +02:00 |
|
Šimon Brandner
|
e7c5711bb7
|
membershipTypes -> groupedEvents
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 07:45:48 +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
|
363175e9a6
|
Clean up i18n
|
2021-07-21 18:13:01 -06:00 |
|
Travis Ralston
|
11773fb0f4
|
Clean up imports
|
2021-07-21 18:12:32 -06:00 |
|
Travis Ralston
|
0e3cc6b8f4
|
Remove voice messages labs flag
Fixes https://github.com/vector-im/element-web/issues/17151
|
2021-07-21 18:09:35 -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 |
|