Merge branch 'develop' into kegan/archived-rooms

2015-12-17 17:07:18 +00:00
parent e8f82527d1 498990b376
commit 8e4d0c0be7
7 changed files with 111 additions and 11 deletions
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -44,6 +44,7 @@ var eventTileTypes = {
    'm.call.hangup' : 'messages.TextualEvent',
    'm.room.name'   : 'messages.TextualEvent',
    'm.room.topic'  : 'messages.TextualEvent',
+    'm.room.third_party_invite': 'messages.TextualEvent'
 };

 var MAX_READ_AVATARS = 5;
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -265,7 +265,7 @@ module.exports = React.createClass({
                             collapsed={ self.props.collapsed } />

                <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
-                             label="Conversations"
+                             label="Rooms"
                             editable={ true }
                             verb="restore"
                             order="recent"