From cd92f0ea62f7630ea2a50441f2cdac2ceb01a21b Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Feb 2016 14:06:03 +0000 Subject: [PATCH 1/6] Use new release of js-sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4453e7f65c..b6db6922ee 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "highlight.js": "^8.9.1", "linkifyjs": "^2.0.0-beta.4", "marked": "^0.3.5", - "matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop", + "matrix-js-sdk": "^0.4.0", "optimist": "^0.6.1", "q": "^1.4.1", "react": "^0.14.2", From 4b13d71bb42565b3994a2a3728bade43440cf48a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Feb 2016 14:14:53 +0000 Subject: [PATCH 2/6] Bump to 0.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6db6922ee..37b5eb1ac4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.0.2", + "version": "0.1.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From e915d7e2156a416ed7e046356f87d18c81a476e9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 11:06:47 +0000 Subject: [PATCH 3/6] 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 4/6] 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 5/6] 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 e3b7330e3fe216d532b7bdc5a8bff121cd1cbcbe Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 Feb 2016 16:17:55 +0000 Subject: [PATCH 6/6] 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