From e915d7e2156a416ed7e046356f87d18c81a476e9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 11:06:47 +0000 Subject: [PATCH 1/9] Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup. Fixes https://github.com/vector-im/vector-web/issues/544 --- src/components/views/rooms/RoomList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 07ed450ef2..9a7396097f 100644 --- a/src/components/views/rooms/RoomList.js +++ b/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; } } From 2d977c54ade8ecc300461e14d63917319177e99a Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 11:56:13 +0000 Subject: [PATCH 2/9] Add barebones changelog --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 CHANGES.rst diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000000..d6c12bbf8e --- /dev/null +++ b/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 From 246025a45f603102213b1c18f12edd6317cd6f99 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 11:56:13 +0000 Subject: [PATCH 3/9] Add barebones changelog --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 CHANGES.rst diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000000..d6c12bbf8e --- /dev/null +++ b/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 From 46a2d4079d3b7648752554bb588f274eb56449bc Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Feb 2016 14:18:26 +0000 Subject: [PATCH 4/9] jenkins.sh for react-sdk --- .gitignore | 7 +++++-- jenkins.sh | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 jenkins.sh diff --git a/.gitignore b/.gitignore index 9b26ed04f1..57144f8e25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -node_modules -lib \ No newline at end of file +/node_modules +/lib + +# tarball created by 'npm pack' +/matrix-react-sdk-*.tgz diff --git a/jenkins.sh b/jenkins.sh new file mode 100644 index 0000000000..fa99e557d6 --- /dev/null +++ b/jenkins.sh @@ -0,0 +1,18 @@ +#!/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 + +# build our tarball +npm pack From dceb4a92978ee61f56276e9f167b9cd8d227600d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Feb 2016 15:24:10 +0000 Subject: [PATCH 5/9] Add a 'version.txt' file to the tarball This will enable the vector build to know what it got --- .gitignore | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 57144f8e25..e2ccc538c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /node_modules /lib -# tarball created by 'npm pack' +# version file and tarball created by 'npm pack' +/version.txt /matrix-react-sdk-*.tgz diff --git a/package.json b/package.json index 4453e7f65c..ae8d9b5727 100644 --- a/package.json +++ b/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 > version.txt" }, "dependencies": { "classnames": "^2.1.2", From e3b7330e3fe216d532b7bdc5a8bff121cd1cbcbe Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 16:17:55 +0000 Subject: [PATCH 6/9] Add CONTRIBUTING.rst file --- CONTRIBUTING.rst | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CONTRIBUTING.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000000..99025f0e0a --- /dev/null +++ b/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 From c1bb52753944e388490943e0fbc24c07aa107c63 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Feb 2016 16:50:27 +0000 Subject: [PATCH 7/9] s/version.txt/git-revision.txt/ --- .gitignore | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e2ccc538c0..949e21b82b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ /lib # version file and tarball created by 'npm pack' -/version.txt +/git-revision.txt /matrix-react-sdk-*.tgz diff --git a/package.json b/package.json index ae8d9b5727..17282dd545 100644 --- a/package.json +++ b/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; git rev-parse HEAD > version.txt" + "prepublish": "npm run build; git rev-parse HEAD > git-revision.txt" }, "dependencies": { "classnames": "^2.1.2", From 8a346dd0ec5c42fe06cb2d10345ca494cdd58745 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Feb 2016 17:24:13 +0000 Subject: [PATCH 8/9] Remove old tarball before building new one --- jenkins.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins.sh b/jenkins.sh index fa99e557d6..a2f28ffb8f 100644 --- a/jenkins.sh +++ b/jenkins.sh @@ -14,5 +14,8 @@ 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 From 757f1b228cec95f64e7a2ffab24549bc61c566a9 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 25 Feb 2016 17:25:36 +0000 Subject: [PATCH 9/9] chmod +x jenkins.sh --- jenkins.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 jenkins.sh diff --git a/jenkins.sh b/jenkins.sh old mode 100644 new mode 100755