fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-14 16:53:05 +02:00
9b6495903c
Use TileShape enum more universally
2021-07-13 18:35:56 -06:00
5240209529
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-02 12:39:51 +03:00
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
573ababb8c
Get rid of mediaSrc and avatarSrc props
2021-06-09 15:23:47 +05:30
6f8c1638aa
isExporting -> forExport and wrap EventTile with Context Provider
2021-06-08 18:35:45 +05:30
1382bd4fee
Handle icons and skip decryption checks during export
2021-06-01 14:47:01 +05:30
59c1b67b7d
Enable support for image, video and audio files
2021-05-31 21:01:19 +05:30
cc919452b5
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-05-07 00:07:51 +03:00
3f4ee9742a
Simple rendering of voice messages in the timeline
...
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
b8ef67e447
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-04-19 13:37:27 +03:00
9606297f7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-02 08:15:51 +02:00
c31967dc97
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-03-26 21:31:28 +02:00
f0d5edbc37
Render voice messages as audio messages for now
2021-03-16 23:48:47 -06:00
b27a8e3c3a
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-03-14 08:30:28 +01:00
8c8b46b984
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-03-12 14:18:12 +02:00
fc5b1ed9d6
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:39 -07:00
4f3fe3d236
Add comments
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-02-25 11:09:52 +01:00
bd5efc7ceb
Pass permallinkCreator to ImageView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-02-24 19:11:08 +01:00
75a0178dad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-09-04 12:41:38 +03:00
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00
96087d61f6
Convert feature setting usages to regular settings
2020-08-17 13:12:18 -06:00
4e5680de85
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-05-25 19:21:19 +03:00
6ff093f5a3
Bring back UnknownBody for UISIs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-08 19:15:59 +01:00
e16f511527
Redesign redactions
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-24 15:07:39 +01:00
26a4a23a33
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-04-10 13:56:01 +03:00
0a6f54da33
Label and use UNSAFE_componentWillMount to minimize warnings
...
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.
For https://github.com/vector-im/riot-web/issues/12877
These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
03d36f30ec
Fix lint errors
2020-03-05 13:44:54 +02:00
a8c5574bc8
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-03-05 13:19:15 +02:00
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
...
Convert CommonJS exports to ES6 exports
2020-01-08 09:09:11 -07:00
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
344dac4fb9
Convert CommonJS exports to ES6-compatible exports
...
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
2019-12-22 21:01:02 -07:00
d22985f12e
Migrate string refs over to createRef
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-08 12:16:17 +00:00
86be607e92
onTileUpdate -> onMessageAllowed
...
We keep onTileUpdate in MessgeEvent because it's a generic thing for the class to handle. onMessageAllowed is slightly different than onShowAllowed because "show allowed" doesn't quite make sense on its own, imo.
2019-11-06 10:52:00 -07:00
3e4a721111
Appease the linter
2019-10-31 16:27:45 -06:00
11068d189c
Hide messages blocked by ban lists
2019-10-31 16:19:42 -06:00
d282675bc6
Improve reply rendering
...
Signed-off-by: Tulir Asokan <tulir@maunium.net >
2019-10-13 15:08:50 +03:00
b243004a6c
Switch to createReactClass: *everything else*. React 16 :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-09-06 18:38:11 +01:00
41e41269dc
use EditorStateTransfer to pass on state to newly mounted editor
2019-06-12 18:52:34 +02:00
9a3752c571
show message editor in textual body instead of replacing event tile
2019-05-17 15:30:07 +01:00
5805a88ab9
adjust to js-sdk changes of marking original event as replaced
2019-05-15 11:54:26 +01:00
4e382b1dd9
rename onWidgetLoad to onHeightChanged
...
as it's easy to confuse it with room widgets, but has nothing to do with it.
2019-03-07 17:02:19 +01:00
9a225840ce
check type before msgtype in the case of m.sticker with msgtype (undef)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-14 12:00:53 +01:00
20caea47f8
make more generic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-13 09:32:21 +01:00
846c14062a
show redacted stickers like other redacted messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-13 09:28:35 +01:00
033c41a2a8
Align pinned message contents and reduce image size
...
Fixes https://github.com/vector-im/riot-web/issues/5421
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-05-26 18:40:48 -06:00
b2d23b6999
Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.
2018-03-12 13:56:02 +00:00
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
