From 34817a004455478af3f61caa48dcd5f45597ae33 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Mar 2020 17:36:18 +0000 Subject: [PATCH 1/9] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 473e9a5f08..136275510a 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "5.1.1-rc.1", + "matrix-react-sdk": "2.2.3-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 687980e4d3..a95ccff3d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7497,9 +7497,10 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "5.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f" +matrix-js-sdk@5.1.1-rc.1: + version "5.1.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a" + integrity sha512-55F4jvJSVYJb5DDmso6Mld3HJ9v1UW0eT///SMcJtHVIJd5ZSLvsGV7rvMny7w6MHy5enfH4E2yItjjvlAL9dA== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" @@ -7519,9 +7520,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "2.2.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/845656064e802054b3857c2a240aaaf88f94f740" +matrix-react-sdk@2.2.3-rc.1: + version "2.2.3-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.3-rc.1.tgz#71ad42c54054130896a7f7db97e7c4148876abe9" + integrity sha512-k9L6QtAfbjyvUzTo5HJxhyiO5bSYo0MXhDpnImLnoOsu8I95AFGd/QuiTz919uhq8GrM2bpWTpV9LSkwQjET9Q== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7549,7 +7551,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "5.1.1-rc.1" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" From 149098921fb89fde4d65d242bb0bc27df68ca5de Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Mar 2020 17:36:48 +0000 Subject: [PATCH 2/9] v1.5.13-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 418375e80c..91008d8b8e 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.12", + "version": "1.5.13-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3dadc2d1d6a241b9aebe26eff5ba2c69a7507dda Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Mar 2020 17:38:21 +0000 Subject: [PATCH 3/9] Prepare changelog for v1.5.13-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d43a93d7..e58b795580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.5.13-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.13-rc.1) (2020-03-11) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.12...v1.5.13-rc.1) + + * Update from Weblate + [\#12688](https://github.com/vector-im/riot-web/pull/12688) + * Fix Docker image version for develop builds + [\#12670](https://github.com/vector-im/riot-web/pull/12670) + * docker: optimize custom sdk builds + [\#12612](https://github.com/vector-im/riot-web/pull/12612) + * riot-desktop open SSO in browser so user doesn't have to auth twice + [\#12590](https://github.com/vector-im/riot-web/pull/12590) + * Fix SSO flows for electron 8.0.2 by re-breaking will-navigate + [\#12585](https://github.com/vector-im/riot-web/pull/12585) + * index.html: Place noscript on top of the page + [\#12563](https://github.com/vector-im/riot-web/pull/12563) + * Remove will-navigate comment after Electron fix + [\#12561](https://github.com/vector-im/riot-web/pull/12561) + * Update loading test for JS SDK IDB change + [\#12552](https://github.com/vector-im/riot-web/pull/12552) + * Upgrade deps + [\#12528](https://github.com/vector-im/riot-web/pull/12528) + Changes in [1.5.12](https://github.com/vector-im/riot-web/releases/tag/v1.5.12) (2020-03-04) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11...v1.5.12) From d4a578542f7f079eff5ae4bd35f1938820e1fcae Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Mar 2020 17:38:21 +0000 Subject: [PATCH 4/9] v1.5.13-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 136275510a..3d52dbaa39 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.12", + "version": "1.5.13-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From c3553a2649cce8a68f29ad3dde823c201d5777ea Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 17 Mar 2020 14:28:23 +0000 Subject: [PATCH 5/9] Upgrade matrix-js-sdk to 5.1.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d52dbaa39..a707a1fb09 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "5.1.1-rc.1", + "matrix-js-sdk": "5.1.1", "matrix-react-sdk": "2.2.3-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index a95ccff3d3..cf3d9f9835 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7497,6 +7497,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1.tgz#d93c2db08acf07e894fb85345d3eaa8d4736b56c" + integrity sha512-zCkylD/oia9v/9Fbx54k/aBNd3szDflscViXq0gf2fQlKzTJRT3LoCAXZ9Uwr7gJ8AE8kFquyZ7revk3Y5YmPQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@5.1.1-rc.1: version "5.1.1-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a" From 8002bc66d71e8bd99915084c3cb9a850dfddde06 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 17 Mar 2020 14:29:06 +0000 Subject: [PATCH 6/9] Upgrade matrix-react-sdk to 2.2.3 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index a707a1fb09..b4f94202e5 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.1.1", - "matrix-react-sdk": "2.2.3-rc.1", + "matrix-react-sdk": "2.2.3", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index cf3d9f9835..ff9137fef9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7512,21 +7512,6 @@ matrix-js-sdk@5.1.1: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@5.1.1-rc.1: - version "5.1.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a" - integrity sha512-55F4jvJSVYJb5DDmso6Mld3HJ9v1UW0eT///SMcJtHVIJd5ZSLvsGV7rvMny7w6MHy5enfH4E2yItjjvlAL9dA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7535,10 +7520,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.2.3-rc.1: - version "2.2.3-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.3-rc.1.tgz#71ad42c54054130896a7f7db97e7c4148876abe9" - integrity sha512-k9L6QtAfbjyvUzTo5HJxhyiO5bSYo0MXhDpnImLnoOsu8I95AFGd/QuiTz919uhq8GrM2bpWTpV9LSkwQjET9Q== +matrix-react-sdk@2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.3.tgz#2687af6acb0f994cbb17a1c4cc37703c437f6080" + integrity sha512-tQVa3uAT//f0+Zw+8sKpRl+/gEvelck5kH0V/BOtM+UrreG66L42KgcXNRDlmO8DjD4iEttcoSHsLGr+XZuXyQ== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7566,7 +7551,7 @@ matrix-react-sdk@2.2.3-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "5.1.1-rc.1" + matrix-js-sdk "5.1.1" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" From 61bf0d5447073cff382367fd937a58bf668eabb4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 17 Mar 2020 14:29:28 +0000 Subject: [PATCH 7/9] v1.5.13 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 91008d8b8e..284a308254 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.13-rc.1", + "version": "1.5.13", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From c84a01310f0b5cc85472494befe94a5903397b83 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 17 Mar 2020 14:31:49 +0000 Subject: [PATCH 8/9] Prepare changelog for v1.5.13 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e58b795580..1e34705284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.13](https://github.com/vector-im/riot-web/releases/tag/v1.5.13) (2020-03-17) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.13-rc.1...v1.5.13) + + * Upgrade to JS SDK 5.1.1 and React SDK 2.2.3 + Changes in [1.5.13-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.13-rc.1) (2020-03-11) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.12...v1.5.13-rc.1) From c4f3d39d42294d6dd1c6690847cfd5b13272dea0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 17 Mar 2020 14:31:49 +0000 Subject: [PATCH 9/9] v1.5.13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4f94202e5..33927743e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.13-rc.1", + "version": "1.5.13", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {