Merge branch 'develop' into kegan/blocking

src/controllers/organisms/RoomList.js

@@ -34,6 +34,7 @@ module.exports = {
         cli.on("Room.timeline", this.onRoomTimeline);
         cli.on("Room.name", this.onRoomName);
         cli.on("RoomState.events", this.onRoomStateEvents);
+        cli.on("RoomMember.name", this.onRoomMemberName);
 
         var rooms = this.getRoomList();
         this.setState({
@@ -116,6 +117,10 @@ module.exports = {
         setTimeout(this.refreshRoomList, 0);
     },
 
+    onRoomMemberName: function(ev, member) {
+        setTimeout(this.refreshRoomList, 0);
+    },
+
 
     refreshRoomList: function() {
         var rooms = this.getRoomList();

src/skins/vector/views/atoms/RoomAvatar.js

@@ -17,7 +17,6 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 
 var RoomAvatarController = require('matrix-react-sdk/lib/controllers/atoms/RoomAvatar')
 

src/skins/vector/views/molecules/EventAsTextTile.js

@@ -18,7 +18,6 @@ limitations under the License.
 
 var React = require('react');
 
-var sdk = require('matrix-react-sdk')
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
 
 module.exports = React.createClass({

src/skins/vector/views/molecules/EventTile.js

@@ -69,8 +69,6 @@ module.exports = React.createClass({
         var SenderProfile = sdk.getComponent('molecules.SenderProfile');
         var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
 
-        var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile');
-
         var content = this.props.mxEvent.getContent();
         var msgtype = content.msgtype;
 

src/skins/vector/views/molecules/MessageTile.js

@@ -17,12 +17,10 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require("classnames");
 
 var sdk = require('matrix-react-sdk')
 
 var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile')
-var ContextualMenu = require('../../../../ContextualMenu');
 
 module.exports = React.createClass({
     displayName: 'MessageTile',

src/skins/vector/views/molecules/RoomHeader.js

@@ -61,7 +61,7 @@ module.exports = React.createClass({
             var call_buttons;
             var zoom_button;
             if (this.state && this.state.call_state != 'ended') {
-                var muteVideoButton;
+                //var muteVideoButton;
                 var activeCall = (
                     CallHandler.getCallForRoom(this.props.room.roomId)
                 );