matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

Browse Source
This commit is contained in:
Tulir Asokan
2021-03-26 21:31:28 +02:00
parent cdf8f09ec2 33e8edb3d5
commit c31967dc97
111 changed files with 6271 additions and 2212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/messages/MessageEvent.js
View File

@@ -74,6 +74,11 @@ export default class MessageEvent extends React.Component {
'm.file': sdk.getComponent('messages.MFileBody'),
'm.audio': sdk.getComponent('messages.MAudioBody'),
'm.video': sdk.getComponent('messages.MVideoBody'),
// TODO: @@ TravisR: Use labs flag determination.
// MSC: https://github.com/matrix-org/matrix-doc/pull/2516
'org.matrix.msc2516.voice': sdk.getComponent('messages.MAudioBody'),
...(this.props.overrideBodyTypes || {}),
};
const evTypes = {