Merge remote-tracking branch 'origin/develop' into dbkr/remove_crypto_migrated_message

2018-03-16 15:48:02 +00:00
parent 00f6deeb46 b68da579f0
commit f42769509f
26 changed files with 2918 additions and 193 deletions
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -624,6 +624,7 @@ var TimelinePanel = React.createClass({
                this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
                dis.dispatch({
                    action: 'on_room_read',
+                    roomId: this.props.timelineSet.room.roomId,
                });
            }
        }