From cba1e95d0a357ad9a10394bbb330d7bccd47d7a2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 26 Sep 2018 09:11:28 -0600 Subject: [PATCH 01/12] Revert "Add getMediaLimits to client" --- src/client.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/client.js b/src/client.js index 821add2d9..bf1edf30b 100644 --- a/src/client.js +++ b/src/client.js @@ -771,17 +771,6 @@ MatrixClient.prototype.getGroups = function() { return this.store.getGroups(); }; -/** - * Get the config for the media repository. - * @param {module:client.callback} callback Optional. - * @return {module:client.Promise} Resolves with an object containing the config. - */ -MatrixClient.prototype.getMediaConfig = function(callback) { - return this._http.requestWithPrefix( - callback, "GET", "/config", undefined, undefined, httpApi.PREFIX_MEDIA_R0, - ); -}; - // Room ops // ======== From cf6c555e6a875c46a6d1237145e72bfd477354c0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:20:21 +0100 Subject: [PATCH 02/12] Prepare changelog for v0.11.1-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b51feeb9..e42811b5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1-rc.1) (2018-09-27) +============================================================================================================ +[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0...v0.11.1-rc.1) + + * Detect when lazy loading has been toggled in client.startClient + [\#746](https://github.com/matrix-org/matrix-js-sdk/pull/746) + * Add getMediaLimits to client + [\#644](https://github.com/matrix-org/matrix-js-sdk/pull/644) + * Split npm start into an init and watch script + [\#742](https://github.com/matrix-org/matrix-js-sdk/pull/742) + * Revert "room name should only take canonical alias into account" + [\#738](https://github.com/matrix-org/matrix-js-sdk/pull/738) + * fix display name disambiguation with LL + [\#737](https://github.com/matrix-org/matrix-js-sdk/pull/737) + * Introduce Room.myMembership event + [\#735](https://github.com/matrix-org/matrix-js-sdk/pull/735) + * room name should only take canonical alias into account + [\#733](https://github.com/matrix-org/matrix-js-sdk/pull/733) + * state events from context response were not wrapped in a MatrixEvent + [\#732](https://github.com/matrix-org/matrix-js-sdk/pull/732) + * Reduce amount of promises created when inserting members + [\#724](https://github.com/matrix-org/matrix-js-sdk/pull/724) + * dont wait for LL members to be stored to resolve the members + [\#726](https://github.com/matrix-org/matrix-js-sdk/pull/726) + * RoomState.members emitted with wrong argument order for OOB members + [\#728](https://github.com/matrix-org/matrix-js-sdk/pull/728) + Changes in [0.11.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.0) (2018-09-10) ================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0-rc.1...v0.11.0) From 847d40e5674b19e947711cbf50aa75f554f17310 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:20:21 +0100 Subject: [PATCH 03/12] v0.11.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e59fdc090..6c3728706 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.0", + "version": "0.11.1-rc.1", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": { From e8e1b431ad6d36b7a986e6ece9deaade63eb13b6 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:28:01 +0100 Subject: [PATCH 04/12] make usage of hub compatible with latest version (2.5) --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 5a0538a58..ab2eae788 100755 --- a/release.sh +++ b/release.sh @@ -245,7 +245,7 @@ release_text=`mktemp` echo "$tag" > "${release_text}" echo >> "${release_text}" cat "${latest_changes}" >> "${release_text}" -hub release create $hubflags $assets -f "${release_text}" "$tag" +hub release create $hubflags $assets -F "${release_text}" "$tag" if [ $dodist -eq 0 ]; then rm -rf "$builddir" From 056479d45063077c8c25a838615a3594f23f567a Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:35:52 +0100 Subject: [PATCH 05/12] Revert "v0.11.1-rc.1" This reverts commit 847d40e5674b19e947711cbf50aa75f554f17310. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c3728706..e59fdc090 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.1-rc.1", + "version": "0.11.0", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": { From e8b307dc4f9e79cdc6c3435251dae30a838a01e4 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:38:25 +0100 Subject: [PATCH 06/12] Prepare changelog for v0.11.1-rc.1 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e42811b5f..d6f8fbdac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,32 @@ +Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1-rc.1) (2018-09-27) +============================================================================================================ +[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0...v0.11.1-rc.1) + + * make usage of hub compatible with latest version (2.5) + [\#747](https://github.com/matrix-org/matrix-js-sdk/pull/747) + * Detect when lazy loading has been toggled in client.startClient + [\#746](https://github.com/matrix-org/matrix-js-sdk/pull/746) + * Add getMediaLimits to client + [\#644](https://github.com/matrix-org/matrix-js-sdk/pull/644) + * Split npm start into an init and watch script + [\#742](https://github.com/matrix-org/matrix-js-sdk/pull/742) + * Revert "room name should only take canonical alias into account" + [\#738](https://github.com/matrix-org/matrix-js-sdk/pull/738) + * fix display name disambiguation with LL + [\#737](https://github.com/matrix-org/matrix-js-sdk/pull/737) + * Introduce Room.myMembership event + [\#735](https://github.com/matrix-org/matrix-js-sdk/pull/735) + * room name should only take canonical alias into account + [\#733](https://github.com/matrix-org/matrix-js-sdk/pull/733) + * state events from context response were not wrapped in a MatrixEvent + [\#732](https://github.com/matrix-org/matrix-js-sdk/pull/732) + * Reduce amount of promises created when inserting members + [\#724](https://github.com/matrix-org/matrix-js-sdk/pull/724) + * dont wait for LL members to be stored to resolve the members + [\#726](https://github.com/matrix-org/matrix-js-sdk/pull/726) + * RoomState.members emitted with wrong argument order for OOB members + [\#728](https://github.com/matrix-org/matrix-js-sdk/pull/728) + Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1-rc.1) (2018-09-27) ============================================================================================================ [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0...v0.11.1-rc.1) From 090c15fe197955c48532de96e04541bb1f38efa4 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:38:25 +0100 Subject: [PATCH 07/12] v0.11.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e59fdc090..6c3728706 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.0", + "version": "0.11.1-rc.1", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": { From 19f023e0eeb0d708cb0ff112dcc84813b3f2e337 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:42:19 +0100 Subject: [PATCH 08/12] Revert "v0.11.1-rc.1" This reverts commit 090c15fe197955c48532de96e04541bb1f38efa4. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c3728706..e59fdc090 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.1-rc.1", + "version": "0.11.0", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": { From 5e4973a1dc2f62b8c08df4261ee441c0e908cc5b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:45:33 +0100 Subject: [PATCH 09/12] changelog --- CHANGELOG.md | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6f8fbdac..b920f350c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,33 +27,6 @@ Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/ta * RoomState.members emitted with wrong argument order for OOB members [\#728](https://github.com/matrix-org/matrix-js-sdk/pull/728) -Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1-rc.1) (2018-09-27) -============================================================================================================ -[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0...v0.11.1-rc.1) - - * Detect when lazy loading has been toggled in client.startClient - [\#746](https://github.com/matrix-org/matrix-js-sdk/pull/746) - * Add getMediaLimits to client - [\#644](https://github.com/matrix-org/matrix-js-sdk/pull/644) - * Split npm start into an init and watch script - [\#742](https://github.com/matrix-org/matrix-js-sdk/pull/742) - * Revert "room name should only take canonical alias into account" - [\#738](https://github.com/matrix-org/matrix-js-sdk/pull/738) - * fix display name disambiguation with LL - [\#737](https://github.com/matrix-org/matrix-js-sdk/pull/737) - * Introduce Room.myMembership event - [\#735](https://github.com/matrix-org/matrix-js-sdk/pull/735) - * room name should only take canonical alias into account - [\#733](https://github.com/matrix-org/matrix-js-sdk/pull/733) - * state events from context response were not wrapped in a MatrixEvent - [\#732](https://github.com/matrix-org/matrix-js-sdk/pull/732) - * Reduce amount of promises created when inserting members - [\#724](https://github.com/matrix-org/matrix-js-sdk/pull/724) - * dont wait for LL members to be stored to resolve the members - [\#726](https://github.com/matrix-org/matrix-js-sdk/pull/726) - * RoomState.members emitted with wrong argument order for OOB members - [\#728](https://github.com/matrix-org/matrix-js-sdk/pull/728) - Changes in [0.11.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.0) (2018-09-10) ================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0-rc.1...v0.11.0) From 634596257d791c91cc3d8b2ed7d50a193837b0b6 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 11:47:28 +0100 Subject: [PATCH 10/12] v0.11.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e59fdc090..6c3728706 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.0", + "version": "0.11.1-rc.1", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": { From fd1b3329f55408eccd257a34e9a06a563a776b44 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 15:23:37 +0200 Subject: [PATCH 11/12] Prepare changelog for v0.11.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b920f350c..86c9b82dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.11.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1) (2018-10-01) +================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.1-rc.1...v0.11.1) + + * No changes since rc.1 + Changes in [0.11.1-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.11.1-rc.1) (2018-09-27) ============================================================================================================ [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.11.0...v0.11.1-rc.1) From 1e1358fcef92b1388cffadde6983c82fa485dbfe Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 15:23:37 +0200 Subject: [PATCH 12/12] v0.11.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c3728706..b21aae3d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "0.11.1-rc.1", + "version": "0.11.1", "description": "Matrix Client-Server SDK for Javascript", "main": "index.js", "scripts": {