Merge branch 'develop' into kegan/blocking

CHANGES.rst

@@ -1,3 +1,14 @@
+Changes in vector v0.1.2 (2015-10-28)
+======================================
+ * Support Room Avatars
+ * Fullscreen video calls
+ * Mute mic in VoIP calls
+ * Fix bug with multiple desktop notifications
+ * Context menu on messages
+ * Better hover-over on member list
+ * Support CAS auth
+ * Many other bug fixes
+ 
 Changes in vector v0.1.1 (2015-08-10)
 ======================================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vector-web",
-  "version": "0.0.1",
+  "version": "0.1.2",
   "description": "Vector webapp",
   "author": "matrix.org",
   "repository": {
@@ -28,9 +28,9 @@
     "filesize": "^3.1.2",
     "flux": "~2.0.3",
     "linkifyjs": "^2.0.0-beta.4",
-    "matrix-js-sdk": "^0.2.2",
-    "matrix-react-sdk": "^0.0.1",
     "modernizr": "^3.1.0",
+    "matrix-js-sdk": "^0.3.0",
+    "matrix-react-sdk": "^0.0.2",
     "q": "^1.4.1",
     "react": "^0.13.3",
     "react-loader": "^1.4.0"

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)
                 );