From 9269d9b669e631d38998293bae0582893ee75072 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 26 Mar 2020 13:27:40 +0000 Subject: [PATCH 01/10] Upgrade matrix-js-sdk to 5.2.0-rc.1 --- package.json | 2 +- yarn.lock | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 50f6808e6d..7277a9b323 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "favico.js": "^0.3.10", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "5.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "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 68423fc233..998756ea7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7450,6 +7450,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.2.0-rc.1: + version "5.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0-rc.1.tgz#014239eb713ea3b648b7a573785d01edff1efd03" + integrity sha512-Jv/0kyZEtkfrD6mlq3g2YoFI2+eOBFOz5D186jJAvFg1W7UaQ5gn6iualR+2AKa1AIk2AT6lDcgPb1djZ7/3Vw== + 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@github:matrix-org/matrix-js-sdk#develop": version "5.1.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b2e154377a4268441a3b27b183dd7f7018187035" @@ -7494,6 +7509,7 @@ matrix-mock-request@^1.2.3: flux "2.1.1" focus-visible "^5.0.2" fuse.js "^2.2.0" + gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" glob-to-regexp "^0.4.1" highlight.js "^9.15.8" @@ -7514,6 +7530,7 @@ matrix-mock-request@^1.2.3: react-beautiful-dnd "^4.0.1" react-dom "^16.9.0" react-focus-lock "^2.2.1" + react-gemini-scrollbar "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594" resize-observer-polyfill "^1.5.0" sanitize-html "^1.18.4" text-encoding-utf-8 "^1.0.1" From 5b35d6e570eaa66809a11e9aac270832597cebcf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 26 Mar 2020 13:28:04 +0000 Subject: [PATCH 02/10] Upgrade matrix-react-sdk to 2.3.0-rc.1 --- package.json | 2 +- yarn.lock | 36 +++++++++++++++--------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 7277a9b323..8c4eaf5dca 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "2.3.0-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 998756ea7a..d7491bbbea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2912,7 +2912,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.20.0: +commander@^2.15.1, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -7465,20 +7465,6 @@ matrix-js-sdk@5.2.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "5.1.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b2e154377a4268441a3b27b183dd7f7018187035" - 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" @@ -7487,9 +7473,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.3" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/b09c063d1b2cae9e26b336de0b0ed69f3d6afcc8" +matrix-react-sdk@2.3.0-rc.1: + version "2.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.3.0-rc.1.tgz#f79a0c225a7b0bc42bc3c82ae227cd982b567a3d" + integrity sha512-96TZxf0pedhRuqz9nREkjTBhBGfsqRP9pn3TZnzETakegiJVuzJben3FKkRDPW+QQxCmJ/ES4xh8bGei8q3JIg== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7509,7 +7496,6 @@ matrix-mock-request@^1.2.3: flux "2.1.1" focus-visible "^5.0.2" fuse.js "^2.2.0" - gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" glob-to-regexp "^0.4.1" highlight.js "^9.15.8" @@ -7517,10 +7503,11 @@ 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.2.0-rc.1" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" + project-name-generator "^2.1.7" prop-types "^15.5.8" qrcode "^1.4.4" qrcode-react "^0.1.16" @@ -7530,7 +7517,6 @@ matrix-mock-request@^1.2.3: react-beautiful-dnd "^4.0.1" react-dom "^16.9.0" react-focus-lock "^2.2.1" - react-gemini-scrollbar "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594" resize-observer-polyfill "^1.5.0" sanitize-html "^1.18.4" text-encoding-utf-8 "^1.0.1" @@ -9614,6 +9600,14 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +project-name-generator@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/project-name-generator/-/project-name-generator-2.1.7.tgz#504c68a2a843247aa3af493a226ecf78ce8beceb" + integrity sha512-kLGQGiyvkZsWtqhPhUs85UkSgmH5OnZJLNrtlqkK+GZPR0cybe8Nr9jG3bD52w2siH9EE3l/a9y56bn0YX5wYw== + dependencies: + commander "^2.15.1" + lodash "^4.17.10" + promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" From bfcb46c4fdbad1bbf31dfcea9c577a6421621539 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 26 Mar 2020 13:28:13 +0000 Subject: [PATCH 03/10] v1.5.14-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 284a308254..886ee9ce44 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", + "version": "1.5.14-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From f5c5c1b991be34eff9a4470974ffc12d7abf93df Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 26 Mar 2020 13:31:03 +0000 Subject: [PATCH 04/10] Prepare changelog for v1.5.14-rc.1 --- CHANGELOG.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e34705284..020a3e4c82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,55 @@ +Changes in [1.5.14-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.14-rc.1) (2020-03-26) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.13...v1.5.14-rc.1) + + * Upgrade JS SDK to 5.2.0-rc.1 and React SDK to 2.3.0-rc.1 + * Update from Weblate + [\#12890](https://github.com/vector-im/riot-web/pull/12890) + * App load tweaks + [\#12869](https://github.com/vector-im/riot-web/pull/12869) + * Add review policy doc + [\#12730](https://github.com/vector-im/riot-web/pull/12730) + * Fix artifact searching in redeployer + [\#12875](https://github.com/vector-im/riot-web/pull/12875) + * Fix Jitsi wrapper being large by getting the config from elsewhere + [\#12845](https://github.com/vector-im/riot-web/pull/12845) + * Add webpack stats which will be used by CI and stored to artifacts + [\#12832](https://github.com/vector-im/riot-web/pull/12832) + * Revert "Remove useless app preloading from Jitsi widget wrapper" + [\#12842](https://github.com/vector-im/riot-web/pull/12842) + * Remove useless app preloading from Jitsi widget wrapper + [\#12836](https://github.com/vector-im/riot-web/pull/12836) + * Update from Weblate + [\#12829](https://github.com/vector-im/riot-web/pull/12829) + * Fix version for Docker builds + [\#12799](https://github.com/vector-im/riot-web/pull/12799) + * Register Mac electron specific Cmd+, shortcut to User Settings + [\#12800](https://github.com/vector-im/riot-web/pull/12800) + * Use a local widget wrapper for Jitsi calls + [\#12780](https://github.com/vector-im/riot-web/pull/12780) + * Delete shortcuts.md + [\#12786](https://github.com/vector-im/riot-web/pull/12786) + * Remove remainders of gemini-scrollbar and react-gemini-scrollbar + [\#12756](https://github.com/vector-im/riot-web/pull/12756) + * Update electron to v7.1.14 + [\#12762](https://github.com/vector-im/riot-web/pull/12762) + * Add url tests to Modernizr + [\#12735](https://github.com/vector-im/riot-web/pull/12735) + * ElectronPlatform: Add support to remove events from the event index. + [\#12703](https://github.com/vector-im/riot-web/pull/12703) + * Bump minimist from 1.2.0 to 1.2.2 in /electron_app + [\#12744](https://github.com/vector-im/riot-web/pull/12744) + * Add docs and flag for custom theme support + [\#12731](https://github.com/vector-im/riot-web/pull/12731) + * Declare jsx in tsconfig for IDEs + [\#12716](https://github.com/vector-im/riot-web/pull/12716) + * Remove stuff that yarn install doesn't think we need + [\#12713](https://github.com/vector-im/riot-web/pull/12713) + * yarn upgrade + [\#12691](https://github.com/vector-im/riot-web/pull/12691) + * Support TypeScript for React components + [\#12696](https://github.com/vector-im/riot-web/pull/12696) + 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) From 0a83f9c7638bb19baaa0eff5797bcd7e4ff525db Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 26 Mar 2020 13:31:03 +0000 Subject: [PATCH 05/10] v1.5.14-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c4eaf5dca..608d85251c 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", + "version": "1.5.14-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 37cebf38cc7ae77539167bfecfaf0283778ee90b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 30 Mar 2020 13:44:42 +0100 Subject: [PATCH 06/10] Upgrade matrix-js-sdk to 5.2.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 608d85251c..db49e4d4d5 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "favico.js": "^0.3.10", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "5.2.0-rc.1", + "matrix-js-sdk": "5.2.0", "matrix-react-sdk": "2.3.0-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 d7491bbbea..973cbac8a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7450,6 +7450,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.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0.tgz#f213fd7671538a57c6d7e0665a2178ab23b950da" + integrity sha512-IscXYNx+k7wq5fuwsvKlXSI6Z1/nQ7TBI8AkStHJOAR8rz1DRoxICLFJtWzpOUSrgQuSaUYpOm4+6hS6IVlmtA== + 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.2.0-rc.1: version "5.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0-rc.1.tgz#014239eb713ea3b648b7a573785d01edff1efd03" From 51f4327ce180a347033b81e8d6dfb97971ec5e61 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 30 Mar 2020 13:45:21 +0100 Subject: [PATCH 07/10] Upgrade matrix-react-sdk to 2.3.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index db49e4d4d5..b91c905888 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.2.0", - "matrix-react-sdk": "2.3.0-rc.1", + "matrix-react-sdk": "2.3.0", "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 973cbac8a8..d7f16e50bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7465,21 +7465,6 @@ matrix-js-sdk@5.2.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@5.2.0-rc.1: - version "5.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0-rc.1.tgz#014239eb713ea3b648b7a573785d01edff1efd03" - integrity sha512-Jv/0kyZEtkfrD6mlq3g2YoFI2+eOBFOz5D186jJAvFg1W7UaQ5gn6iualR+2AKa1AIk2AT6lDcgPb1djZ7/3Vw== - 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" @@ -7488,10 +7473,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.3.0-rc.1: - version "2.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.3.0-rc.1.tgz#f79a0c225a7b0bc42bc3c82ae227cd982b567a3d" - integrity sha512-96TZxf0pedhRuqz9nREkjTBhBGfsqRP9pn3TZnzETakegiJVuzJben3FKkRDPW+QQxCmJ/ES4xh8bGei8q3JIg== +matrix-react-sdk@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.3.0.tgz#67c50130e2c62dcd48bae684b1d68eae4ff229f4" + integrity sha512-K1+y2Q3XcjRu7jN72JKO2bG8yD0MK8i1tYI8/oafvFJP1HlpphUzF58tQ/EAiXs1a4UnsxBV27xvrHOxqzflLQ== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7518,7 +7503,7 @@ matrix-react-sdk@2.3.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "5.2.0-rc.1" + matrix-js-sdk "5.2.0" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" From 5bd155c294d82329af2f4b2e76fadfa8c22bd949 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 30 Mar 2020 13:45:32 +0100 Subject: [PATCH 08/10] v1.5.14 --- 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 886ee9ce44..4e014c9633 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.14-rc.1", + "version": "1.5.14", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 45ff2fdcde0de1428064b9815498fed7c1a919ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 30 Mar 2020 13:48:39 +0100 Subject: [PATCH 09/10] Prepare changelog for v1.5.14 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 020a3e4c82..02d5492afb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.14](https://github.com/vector-im/riot-web/releases/tag/v1.5.14) (2020-03-30) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.14-rc.1...v1.5.14) + + * Upgrade JS SDK to 5.2.0 and React SDK to 2.3.0 + Changes in [1.5.14-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.14-rc.1) (2020-03-26) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.13...v1.5.14-rc.1) From 413b26d71b6dd4edff8a10d94580bb830dcdc354 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 30 Mar 2020 13:48:40 +0100 Subject: [PATCH 10/10] v1.5.14 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b91c905888..496c2a31f2 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.14-rc.1", + "version": "1.5.14", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {