Robin Townsend
3bf742f7aa
Merge branch 'develop' into zoom-to-cursor
2021-07-22 09:39:52 -04:00
Germain Souquet
552770c15a
Remove excessive padding after url previews
2021-07-22 14:24:49 +02:00
Travis Ralston
6b54f83b08
Merge branch 'develop' into travis/voice-messages/large
2021-07-22 04:16:53 -06: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
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
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
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
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
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
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
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
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
3023fda497
Make MFileBody inherit the MediaBody styles
2021-07-21 14:46:25 -06: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
Germain
0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146
2021-07-21 17:17:51 +01:00
David Baker
a6c432d66f
fix types
...
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Germain Souquet
26ca41f699
Cache room member count on the messagePanel
2021-07-21 17:26:41 +02:00
Germain Souquet
43d62aa8c1
Use more performant getMembersCount to decide to hide or show sender
2021-07-21 16:43:57 +02:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120
...
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
Germain Souquet
e5bc5a933e
Use cached value to read member count
2021-07-21 16:10:18 +02:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1
...
Play only one audio file at a time
2021-07-21 07:58:46 -06:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Germain Souquet
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +02:00
Germain Souquet
ae51653348
Add null guard for room prop in EventTile
2021-07-21 12:41:02 +02:00
Michael Telatynski
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions
2021-07-21 11:30:15 +01:00
Germain
b31b8f1b41
Remove old container sizing comment
...
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +01:00
Germain Souquet
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
Germain Souquet
794c49c5db
Migrate MStickerBody to TypeScript
2021-07-21 09:52:09 +02:00
Germain Souquet
54841d63dc
Fix wrench-tests by importing EmbeddedPage through sdk.getComponent
2021-07-21 09:29:33 +02:00
Robin Townsend
1d1d93ed14
Apply code review suggestion
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 03:17:55 -04:00
Robin Townsend
0497e0864f
Fix types
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:42:30 -04:00
Robin Townsend
3911666c52
Zoom images to where the cursor points
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:25:34 -04:00
Travis Ralston
45f9f3e13e
Name functions better
2021-07-20 23:34:27 -06:00
Travis Ralston
a759d61ba0
Play only one audio file at a time
...
Fixes https://github.com/vector-im/element-web/issues/17439
2021-07-20 23:28:07 -06:00
Robin Townsend
aefdac1115
Fix error when hovering over non-emoji reactions
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 22:41:49 -04:00
Šimon Brandner
e45b1a1e41
Missing license header
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 18:52:02 +02:00
Šimon Brandner
862932cce5
Don't use require
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 18:48:18 +02:00
Germain
3372a77248
Remove grecaptcha from globals thanks to #6412
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:45:47 +01:00
Germain Souquet
efce2d16f1
Merge branch 'develop' into gsouqet/ts-migration-1
2021-07-20 18:43:08 +02:00
Germain
745a8d3860
Explain isSmall proper for CountryDropdown
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:18:33 +01:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
...
* develop: (141 commits)
delint
Doc some values
Remove useless image reference
Revert accidental renaming of dispatcherRef
Fix event highlighthing
Move some code around for clarity
Constrain emoji skins type even further
Delint
i18n irc and fix lint from merge conflict
Remove unwanted coma in EventTile
fix three lints
lint fix
not sure how these happened :/
remove unused prop
Update eslint-plugin-matrix-org
Fix placeholder centering
Make emoji skins type more specific
Rename some variables since their purpose has changed
Conform to new react and typescript eslint rules
Apply code review suggestions
...
2021-07-20 17:33:05 +02:00
Travis Ralston
7892539a9b
delint
2021-07-20 09:03:26 -06:00
Travis Ralston
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00