Add reply fallback and run gen-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-03-04 12:39:34 +00:00
parent 665ddccb0d
commit df56a67fda
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
5 changed files with 123 additions and 55 deletions

View file

@ -35,6 +35,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import ContextualMenu from '../../structures/ContextualMenu';
import SettingsStore from "../../../settings/SettingsStore";
import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
import ReplyThread from "../elements/ReplyThread";
linkifyMatrix(linkify);
@ -423,6 +424,8 @@ module.exports = React.createClass({
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
// Part of Replies fallback support
stripReplyFallback: Boolean(ReplyThread.getInReplyTo(mxEvent)),
});
if (this.props.highlightLink) {