OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,685 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

35685 Commits (c5c58a5e91bec4e72a32d13fc2d74496e5711480)

Author SHA1 Message Date
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
Germain Souquet 9180d478eb Prevent action bar to overlap the event content 2021-07-22 11:00:34 +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
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
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
Travis Ralston 158d4368e0
Merge pull request #5974 from jaiwanth-v/spaces-jump-to-room 
Navigate to the first room with notifications when clicked on space notification dot
 2021-07-21 22:18:54 -06: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 77ca27dd3a Merge branch 'origin/develop' into Weblate. 2021-07-22 02:02:07 +00:00
Travis Ralston fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors 
Make diff colors in codeblocks more pleasant
 2021-07-21 20:02:03 -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 ca1a1e488a Take out the jump when recording a voice message 2021-07-21 14:47:42 -06:00
Travis Ralston 56290f3d01 Force padding overrides to take precedence over MediaBody styles 2021-07-21 14:47:27 -06:00
Travis Ralston 87ac2d7cc5 Move padding and width to MediaBody styles 2021-07-21 14:47:02 -06:00
Travis Ralston 3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06:00
Travis Ralston 5386d23008 Fix voice message tile taking up a couple extra px at the bottom 
... by returning it to the default block shape.
 2021-07-21 14:43:26 -06:00