From 74b4c91d58c72e6bd4c9f4b2e61a710d0cda6f2a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Apr 2021 13:11:54 +0100 Subject: [PATCH 1/6] Prepare changelog for v1.7.25-rc.1 --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9225a9e59..4da277d6a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +Changes in [1.7.25-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.25-rc.1) (2021-04-07) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24...v1.7.25-rc.1) + + * Upgrade to React SDK 3.18.0-rc.1 and JS SDK 9.11.0-rc.1 + * Translations update from Weblate + [\#16882](https://github.com/vector-im/element-web/pull/16882) + * Revert "Docker image: serve pre-compressed assets using gzip_static" + [\#16838](https://github.com/vector-im/element-web/pull/16838) + * Move native node modules documentation to element-desktop + [\#16814](https://github.com/vector-im/element-web/pull/16814) + * Add user settings for warn before exit + [\#16781](https://github.com/vector-im/element-web/pull/16781) + * Change ISSUE_TEMPLATE bold lines to proper headers + [\#16768](https://github.com/vector-im/element-web/pull/16768) + * Add example for deployment into Kubernetes + [\#16447](https://github.com/vector-im/element-web/pull/16447) + * Create bare-bones `PULL_REQUEST_TEMPLATE.md` + [\#16770](https://github.com/vector-im/element-web/pull/16770) + * Add webpack config and labs flag docs for voice messages + [\#16705](https://github.com/vector-im/element-web/pull/16705) + Changes in [1.7.24](https://github.com/vector-im/element-web/releases/tag/v1.7.24) (2021-03-29) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24-rc.1...v1.7.24) From 11ce4fa41bc3e3e4618fe3ab129fc48da56c84fc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Apr 2021 13:11:55 +0100 Subject: [PATCH 2/6] v1.7.25-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c35b307e91..79228dd635 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.24", + "version": "1.7.25-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d1d6ef55ff3fc0fe170e3bb7bbc6f3c9f5bd0f37 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Apr 2021 15:26:37 +0100 Subject: [PATCH 3/6] Upgrade matrix-js-sdk to 9.11.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 79228dd635..72f1c1f81b 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.11.0-rc.1", + "matrix-js-sdk": "9.11.0", "matrix-react-sdk": "3.18.0-rc.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index c1e2ee35da..4c262f9166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz#57ba60dfbcf2b32917eb6d7232d0e81cf0de0d3a" + integrity sha512-wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.11.0-rc.1: version "9.11.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d" From 19748762a59cb49911dc1e6447d28ed9b9b229b8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Apr 2021 15:27:10 +0100 Subject: [PATCH 4/6] Upgrade matrix-react-sdk to 3.18.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 72f1c1f81b..f49fb9b0de 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.11.0", - "matrix-react-sdk": "3.18.0-rc.1", + "matrix-react-sdk": "3.18.0", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 4c262f9166..e4ae37fe2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7521,21 +7521,6 @@ matrix-js-sdk@9.11.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.11.0-rc.1: - version "9.11.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d" - integrity sha512-1U7l9FgWVWghTRRhU0A7zdniXS7mZ2Zr7H/lFUp5V3SVK62K7s3mKmFlGnuBNODnWYv4ZVKvlkCNaYYLSGw6/g== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - 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" @@ -7544,10 +7529,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.18.0-rc.1: - version "3.18.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0-rc.1.tgz#2a41f302d898ca02b97da027b9c60d8b24722215" - integrity sha512-tIZniXw/2fHdBrSNzy6DmXVNE0+uko5svajQHM0a9wteBhNTap+MtoAbV0QWCpF6/NsLMsjmpxbUUfRkhFZzzQ== +matrix-react-sdk@3.18.0: + version "3.18.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0.tgz#119b0a908974e46ad9973aa7c4ea10ee06fab2b4" + integrity sha512-RkivwI4Rv+l93tmj3GK1XDK9hGAoIILcQZ+rr1cQ1AymmFSwF/mQLVJICewLZCcp2FP9osJg75/JbmPBaurxdw== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7575,7 +7560,7 @@ matrix-react-sdk@3.18.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.11.0-rc.1" + matrix-js-sdk "9.11.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" opus-recorder "^8.0.3" From 95fb11a2b97241b3a15de1201d8a06eb952d583b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Apr 2021 15:29:40 +0100 Subject: [PATCH 5/6] Prepare changelog for v1.7.25 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4da277d6a3..bfd055700d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.25](https://github.com/vector-im/element-web/releases/tag/v1.7.25) (2021-04-12) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25-rc.1...v1.7.25) + + * Upgrade to React SDK 3.18.0 and JS SDK 9.11.0 + Changes in [1.7.25-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.25-rc.1) (2021-04-07) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24...v1.7.25-rc.1) From 0bc5a012284a89481fbb00f5646f4b84a13474ee Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Apr 2021 15:29:40 +0100 Subject: [PATCH 6/6] v1.7.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f49fb9b0de..f6faed57cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.25-rc.1", + "version": "1.7.25", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {