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

.gitignore

@@ -1,2 +1,6 @@
-node_modules
-lib
+/node_modules
+/lib
+
+# version file and tarball created by 'npm pack'
+/git-revision.txt
+/matrix-react-sdk-*.tgz

CHANGES.rst

@@ -0,0 +1,9 @@
+Changes in matrix-react-sdk v0.1.0 (2016-02-24)
+===============================================
+ * Significant refactor: remove separation between views and controllers
+ * This release of the react-sdk will require additional components to function.
+   See https://github.com/vector-im/vector-web for a complete application.
+
+Changes in matrix-react-sdk v0.0.2 (2015-10-28)
+===============================================
+ * Initial release

CONTRIBUTING.rst

@@ -0,0 +1,4 @@
+Contributing code to The React SDK
+==================================
+
+matrix-react-sdk follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst

jenkins.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+export NVM_DIR="/home/jenkins/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+nvm use 4
+
+set -x
+
+# install the version of js-sdk provided to us by jenkins
+npm install ./node_modules/matrix-js-sdk-*.tgz
+
+# install the other dependencies
+npm install
+
+# delete the old tarball, if it exists
+rm -f matrix-react-sdk-*.tgz
+
+# build our tarball
+npm pack

package.json

@@ -17,7 +17,7 @@
     "build": "babel src -d lib --source-maps",
     "start": "babel src -w -d lib --source-maps",
     "clean": "rimraf lib",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build; git rev-parse HEAD > git-revision.txt"
   },
   "dependencies": {
     "classnames": "^2.1.2",

src/components/views/rooms/RoomList.js

@@ -127,7 +127,7 @@ module.exports = React.createClass({
 
     onRoomTimeline: function(ev, room, toStartOfTimeline) {
         if (toStartOfTimeline) return;
-        this.refreshRoomList();
+        this._delayedRefreshRoomList();
     },
 
     onRoomReceipt: function(receiptEvent, room) {
@@ -137,7 +137,7 @@ module.exports = React.createClass({
         for (var i = 0; i < receiptKeys.length; ++i) {
             var rcpt = receiptEvent.getContent()[receiptKeys[i]];
             if (rcpt['m.read'] && rcpt['m.read'][MatrixClientPeg.get().credentials.userId]) {
-                this.refreshRoomList();
+                this._delayedRefreshRoomList();
                 break;
             }
         }