From c519361b4ef8fadc772dc8fda07256fc4646aeec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 13:44:06 +0000 Subject: [PATCH 01/49] Upgrade dependency to matrix-js-sdk@34.13.0-rc.0 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a48284bb97..732447e64e 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "maplibre-gl": "^4.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "34.13.0-rc.0", "matrix-widget-api": "^1.10.0", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index a2bf286f1b..94218f883f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8352,9 +8352,10 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "34.12.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/544ac86d2080da8e55d0b727cae826e42600c490" +matrix-js-sdk@34.13.0-rc.0: + version "34.13.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.13.0-rc.0.tgz#788b80be39ca3a084d311c1415b45a67b8dfea66" + integrity sha512-91hxAAgIsO0hblVdV3YqbBqzFJA5wlBlrrqo/dyEXTMsU6qxf64ABCnnz/0pAbTlQTFLtogSIQrIRBo0NNbPvg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0" From 756ce2c6394e32c6e3807c803e37d013c2e4f36b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 13:56:17 +0000 Subject: [PATCH 02/49] v1.11.87-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 732447e64e..a439264aba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.86", + "version": "1.11.87-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 2ebc1b4a897129f64ac16f435d3e1c8d7e44b77b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 14:14:29 +0000 Subject: [PATCH 03/49] Fix deploy action Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/deploy.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a41a4dcec7..29c885badb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,8 @@ # Manual deploy workflow for deploying to app.element.io & staging.element.io # Runs automatically for staging.element.io when an RC or Release is published # Note: Does *NOT* run automatically for app.element.io so that it gets tested on staging.element.io beforehand -name: Build and Deploy ${{ inputs.site || 'staging.element.io' }} +name: Deploy release +run-name: Deploy ${{ github.ref_name }} to ${{ inputs.site || 'staging.element.io' }} on: release: types: [published] @@ -28,6 +29,8 @@ jobs: env: SITE: ${{ inputs.site || 'staging.element.io' }} steps: + - uses: actions/checkout@v4 + - name: Load GPG key run: | curl https://packages.element.io/element-release-key.gpg | gpg --import @@ -45,20 +48,20 @@ jobs: - name: Download current version for its old bundles id: current_download if: steps.current_version.outputs.version != github.ref_name - uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }} + uses: ./.github/actions/download-verify-element-tarball with: tag: steps.current_version.outputs.version - out-file-path: current_version + out-file-path: _current_version - name: Download target version - uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }} + uses: ./.github/actions/download-verify-element-tarball with: tag: ${{ github.ref_name }} out-file-path: _deploy - name: Merge current bundles into target if: steps.current_download.outcome == 'success' - run: cp -vnpr current_version/bundles/* _deploy/bundles/ + run: cp -vnpr _current_version/bundles/* _deploy/bundles/ - name: Copy config run: cp element.io/app/config.json _deploy/config.json From 94130be5a72381cf2c0d6ce078f12175bbf26366 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 14:19:43 +0000 Subject: [PATCH 04/49] v1.11.87-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a439264aba..866680dc41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.0", + "version": "1.11.87-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4285b4b14041e9a0b4346bd6610281d9f1b6a743 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 14:27:06 +0000 Subject: [PATCH 05/49] GPG_FINGERPRINT is in vars not secrets Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 29c885badb..a251e65509 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,7 @@ jobs: curl https://packages.element.io/element-release-key.gpg | gpg --import gpg -k "$GPG_FINGERPRINT" env: - GPG_FINGERPRINT: ${{ secrets.GPG_FINGERPRINT }} + GPG_FINGERPRINT: ${{ vars.GPG_FINGERPRINT }} - name: Check current version on deployment id: current_version From 9860f9320a0eb56031266df83e9c991c8d90fef9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 14:29:01 +0000 Subject: [PATCH 06/49] v1.11.87-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 866680dc41..0d4d410ecb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.1", + "version": "1.11.87-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From b4445fed5343ddf1bae244c8c484bde04947cfab Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 14:41:00 +0000 Subject: [PATCH 07/49] Specify shell:bash in download-verify-element-tarball Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/actions/download-verify-element-tarball/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/download-verify-element-tarball/action.yml b/.github/actions/download-verify-element-tarball/action.yml index 978b27bae4..ad9f3018b7 100644 --- a/.github/actions/download-verify-element-tarball/action.yml +++ b/.github/actions/download-verify-element-tarball/action.yml @@ -19,15 +19,19 @@ runs: out-file-path: ${{ runner.temp }}/download-verify-element-tarball - name: Verify tarball + shell: bash run: gpg --verify element-*.tar.gz.asc element-*.tar.gz working-directory: ${{ runner.temp }}/download-verify-element-tarball - name: Extract tarball + shell: bash run: tar xvzf element-*.tar.gz -C webapp --strip-components=1 working-directory: ${{ runner.temp }}/download-verify-element-tarball - name: Move webapp to out-file-path + shell: bash run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }} - name: Clean up temp directory + shell: bash run: rm -R ${{ runner.temp }}/download-verify-element-tarball From 20532144d2268433e0176bf5db043ba43bde3c9a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 14:42:48 +0000 Subject: [PATCH 08/49] v1.11.87-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d4d410ecb..d5f8cfb04b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.2", + "version": "1.11.87-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4259e96c904d4ec33df579b77f9d1cab7b6932f4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 14:53:17 +0000 Subject: [PATCH 09/49] Fix current version checking function Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a251e65509..b0cbaef403 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,7 +41,7 @@ jobs: - name: Check current version on deployment id: current_version run: | - echo "version=$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT + echo "version=v$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT # The current version bundle melding dance is skipped if the version we're deploying is the same # as then we're just doing a re-deploy of the same version with potentially different configs. @@ -50,7 +50,7 @@ jobs: if: steps.current_version.outputs.version != github.ref_name uses: ./.github/actions/download-verify-element-tarball with: - tag: steps.current_version.outputs.version + tag: ${{ steps.current_version.outputs.version }} out-file-path: _current_version - name: Download target version From 903928c33c553e7b172d92998aaddcee7ebd061e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 14:56:48 +0000 Subject: [PATCH 10/49] v1.11.87-rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5f8cfb04b..bcd8d3c135 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.3", + "version": "1.11.87-rc.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From bd0bb879ec33b369f18cd7db2208b46beb1c061b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 15:03:39 +0000 Subject: [PATCH 11/49] Fix download-verify-element-tarball not consuming inputs.tag Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/actions/download-verify-element-tarball/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/download-verify-element-tarball/action.yml b/.github/actions/download-verify-element-tarball/action.yml index ad9f3018b7..665a5af62d 100644 --- a/.github/actions/download-verify-element-tarball/action.yml +++ b/.github/actions/download-verify-element-tarball/action.yml @@ -14,7 +14,7 @@ runs: id: current_download uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1 with: - tag: steps.current_version.outputs.version + tag: ${{ inputs.tag }} fileName: element-*.tar.gz* out-file-path: ${{ runner.temp }}/download-verify-element-tarball From 9ddd5d96eb5e46fa72276836dda58fe7569bd44c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 15:05:15 +0000 Subject: [PATCH 12/49] v1.11.87-rc.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bcd8d3c135..a8f914a779 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.4", + "version": "1.11.87-rc.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 3d48168394c12c599f1540e95331c39e27c0bdfe Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 15:11:48 +0000 Subject: [PATCH 13/49] We have to make the tar output directory manually Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/actions/download-verify-element-tarball/action.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/download-verify-element-tarball/action.yml b/.github/actions/download-verify-element-tarball/action.yml index 665a5af62d..e61b96596b 100644 --- a/.github/actions/download-verify-element-tarball/action.yml +++ b/.github/actions/download-verify-element-tarball/action.yml @@ -10,7 +10,7 @@ inputs: runs: using: composite steps: - - name: Download current version for its old bundles + - name: Download release tarball id: current_download uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1 with: @@ -25,7 +25,9 @@ runs: - name: Extract tarball shell: bash - run: tar xvzf element-*.tar.gz -C webapp --strip-components=1 + run: | + mkdir webapp + tar xvzf element-*.tar.gz -C webapp --strip-components=1 working-directory: ${{ runner.temp }}/download-verify-element-tarball - name: Move webapp to out-file-path From adfc66bd1b46b6f8104cedae32689446abc1c7f3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 15:15:08 +0000 Subject: [PATCH 14/49] v1.11.87-rc.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8f914a779..404b30815a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.5", + "version": "1.11.87-rc.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From c1549e6aaa6d583583402874b6170c70276c62f3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Nov 2024 15:28:59 +0000 Subject: [PATCH 15/49] Fix running-workflow-name so it can self-detect Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b0cbaef403..ac6249d654 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -76,7 +76,7 @@ jobs: uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork with: ref: ${{ github.sha }} - running-workflow-name: "Build and Deploy ${{ env.SITE }}" + running-workflow-name: "Deploy to Cloudflare Pages" repo-token: ${{ secrets.GITHUB_TOKEN }} wait-interval: 10 check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$ From a891dcddc25325a32303cc01775cfe4b7a6e21a8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 15:33:55 +0000 Subject: [PATCH 16/49] v1.11.87-rc.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 404b30815a..e55447f0a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.6", + "version": "1.11.87-rc.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4730352092eb06f4054e46405d87e7693807425a Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 3 Dec 2024 08:45:44 +0000 Subject: [PATCH 17/49] [create-pull-request] automated change (#28621) Co-authored-by: t3chguy <2403652+t3chguy@users.noreply.github.com> --- playwright/plugins/homeserver/synapse/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playwright/plugins/homeserver/synapse/index.ts b/playwright/plugins/homeserver/synapse/index.ts index f789ca543b..2b386afb53 100644 --- a/playwright/plugins/homeserver/synapse/index.ts +++ b/playwright/plugins/homeserver/synapse/index.ts @@ -20,7 +20,7 @@ import { randB64Bytes } from "../../utils/rand"; // Docker tag to use for synapse docker image. // We target a specific digest as every now and then a Synapse update will break our CI. // This digest is updated by the playwright-image-updates.yaml workflow periodically. -const DOCKER_TAG = "develop@sha256:489fe921e03440af87e001106c41c70ffc55a1e8078d1a7f45e16fbaddc5088a"; +const DOCKER_TAG = "develop@sha256:892793d00b70e9a92ceb929263fe734408ce7f50cb4436c65f07407048a6d4e7"; async function cfgDirFromTemplate(opts: StartHomeserverOpts): Promise> { const templateDir = path.join(__dirname, "templates", opts.template); From 8774a68a1386646aab0542cb2e4525c6e522d0f9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Dec 2024 12:25:29 +0000 Subject: [PATCH 18/49] Upgrade dependency to matrix-js-sdk@34.13.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e55447f0a7..4c4e5ea150 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "maplibre-gl": "^4.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "34.13.0-rc.0", + "matrix-js-sdk": "34.13.0", "matrix-widget-api": "^1.10.0", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index 94218f883f..4c91bbdd45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8352,10 +8352,10 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@34.13.0-rc.0: - version "34.13.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.13.0-rc.0.tgz#788b80be39ca3a084d311c1415b45a67b8dfea66" - integrity sha512-91hxAAgIsO0hblVdV3YqbBqzFJA5wlBlrrqo/dyEXTMsU6qxf64ABCnnz/0pAbTlQTFLtogSIQrIRBo0NNbPvg== +matrix-js-sdk@34.13.0: + version "34.13.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.13.0.tgz#5a7a112cc0c9edd3bd58ae9669070dd220912f51" + integrity sha512-AAU8ZdCawca+7ucQfdcC3LA85OtCTV7QeqcjvKt/ZZhU3xL9VoawuoRQ+4R6H8KZnqyJmT4j7bdeC0jG4qcqLg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0" From 823828fc17e1e77b47b9ce3184858230f1a8460f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Dec 2024 12:30:13 +0000 Subject: [PATCH 19/49] v1.11.87 --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a554890dc6..ebe9f061ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +Changes in [1.11.87](https://github.com/element-hq/element-web/releases/tag/v1.11.87) (2024-12-03) +================================================================================================== +## ✨ Features + +* Send and respect MSC4230 is\_animated flag ([#28513](https://github.com/element-hq/element-web/pull/28513)). Contributed by @t3chguy. +* Display a warning when an unverified user's identity changes ([#28211](https://github.com/element-hq/element-web/pull/28211)). Contributed by @uhoreg. +* Swap out Twitter link for Mastodon on auth footer ([#28508](https://github.com/element-hq/element-web/pull/28508)). Contributed by @t3chguy. +* Consider `org.matrix.msc3417.call` as video room in create room dialog ([#28497](https://github.com/element-hq/element-web/pull/28497)). Contributed by @t3chguy. +* Standardise icons using Compound Design Tokens ([#28217](https://github.com/element-hq/element-web/pull/28217)). Contributed by @t3chguy. +* Start sending stable `m.marked_unread` events ([#28478](https://github.com/element-hq/element-web/pull/28478)). Contributed by @tulir. +* Upgrade to compound-design-tokens v2 ([#28471](https://github.com/element-hq/element-web/pull/28471)). Contributed by @t3chguy. +* Standardise icons using Compound Design Tokens ([#28286](https://github.com/element-hq/element-web/pull/28286)). Contributed by @t3chguy. +* Remove reply fallbacks as per merged MSC2781 ([#28406](https://github.com/element-hq/element-web/pull/28406)). Contributed by @t3chguy. +* Use React Suspense when rendering async modals ([#28386](https://github.com/element-hq/element-web/pull/28386)). Contributed by @t3chguy. + +## 🐛 Bug Fixes + +* Add spinner when room encryption is loading in room settings ([#28535](https://github.com/element-hq/element-web/pull/28535)). Contributed by @florianduros. +* Fix getOidcCallbackUrl for Element Desktop ([#28521](https://github.com/element-hq/element-web/pull/28521)). Contributed by @t3chguy. +* Filter out redacted poll votes to avoid crashing the Poll widget ([#28498](https://github.com/element-hq/element-web/pull/28498)). Contributed by @t3chguy. +* Fix force tab complete not working since switching to React 18 createRoot API ([#28505](https://github.com/element-hq/element-web/pull/28505)). Contributed by @t3chguy. +* Fix media captions in bubble layout ([#28480](https://github.com/element-hq/element-web/pull/28480)). Contributed by @tulir. +* Reset cross-signing before backup when resetting both ([#28402](https://github.com/element-hq/element-web/pull/28402)). Contributed by @uhoreg. +* Listen to events so that encryption icon updates when status changes ([#28407](https://github.com/element-hq/element-web/pull/28407)). Contributed by @uhoreg. +* Check that the file the user chose has a MIME type of `image/*` ([#28467](https://github.com/element-hq/element-web/pull/28467)). Contributed by @t3chguy. +* Fix download button size in message action bar ([#28472](https://github.com/element-hq/element-web/pull/28472)). Contributed by @t3chguy. +* Allow tab completing users in brackets ([#28460](https://github.com/element-hq/element-web/pull/28460)). Contributed by @t3chguy. +* Fix React 18 strict mode breaking spotlight dialog ([#28452](https://github.com/element-hq/element-web/pull/28452)). Contributed by @MidhunSureshR. + + Changes in [1.11.86](https://github.com/element-hq/element-web/releases/tag/v1.11.86) (2024-11-19) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 4c4e5ea150..9622af8240 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.87-rc.7", + "version": "1.11.87", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ce3fa2164ff5bb23d4323f2ceb745862ea2bd619 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Dec 2024 12:33:41 +0000 Subject: [PATCH 20/49] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d8289d62c5..d0a073ec2e 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "maplibre-gl": "^4.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "34.13.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-widget-api": "^1.10.0", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index d166956f8b..5cf9b0d595 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8240,10 +8240,9 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@34.13.0: +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "34.13.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.13.0.tgz#5a7a112cc0c9edd3bd58ae9669070dd220912f51" - integrity sha512-AAU8ZdCawca+7ucQfdcC3LA85OtCTV7QeqcjvKt/ZZhU3xL9VoawuoRQ+4R6H8KZnqyJmT4j7bdeC0jG4qcqLg== + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c4ea57d42dcf8bd04c40feaa2c686487dbcab338" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0" From 865c5b0e9c69e039e1e899e721538d5d5cbd5b80 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 3 Dec 2024 12:42:23 +0000 Subject: [PATCH 21/49] Fix deploy script by normalizing version string Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/actions/download-verify-element-tarball/action.yml | 1 - .github/workflows/deploy.yml | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/download-verify-element-tarball/action.yml b/.github/actions/download-verify-element-tarball/action.yml index e61b96596b..75d325c543 100644 --- a/.github/actions/download-verify-element-tarball/action.yml +++ b/.github/actions/download-verify-element-tarball/action.yml @@ -11,7 +11,6 @@ runs: using: composite steps: - name: Download release tarball - id: current_download uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1 with: tag: ${{ inputs.tag }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ac6249d654..daac3bfed8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,7 +41,8 @@ jobs: - name: Check current version on deployment id: current_version run: | - echo "version=v$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT + version=$(curl -s https://$SITE/version) + echo "version=${version#v}" >> $GITHUB_OUTPUT # The current version bundle melding dance is skipped if the version we're deploying is the same # as then we're just doing a re-deploy of the same version with potentially different configs. @@ -50,7 +51,7 @@ jobs: if: steps.current_version.outputs.version != github.ref_name uses: ./.github/actions/download-verify-element-tarball with: - tag: ${{ steps.current_version.outputs.version }} + tag: v${{ steps.current_version.outputs.version }} out-file-path: _current_version - name: Download target version From b72c053d1ab02f8061fcb61dcc9ed0c683f68267 Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Tue, 3 Dec 2024 15:25:06 +0100 Subject: [PATCH 22/49] Add `Close` tooltip to dialog (#28617) * Add `Close` tooltip to dialog * Update snapshots --- src/components/views/dialogs/BaseDialog.tsx | 1 + .../right_panel/__snapshots__/UserInfo-test.tsx.snap | 4 ++-- .../views/rooms/__snapshots__/RoomHeader-test.tsx.snap | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/views/dialogs/BaseDialog.tsx b/src/components/views/dialogs/BaseDialog.tsx index 00da8b4f52..ccb162e1cb 100644 --- a/src/components/views/dialogs/BaseDialog.tsx +++ b/src/components/views/dialogs/BaseDialog.tsx @@ -119,6 +119,7 @@ export default class BaseDialog extends React.Component { diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap index 06a3c3a12b..1744081389 100644 --- a/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap +++ b/test/unit-tests/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap @@ -88,7 +88,7 @@ exports[` with crypto enabled renders 1`] = `

- - - -
-
-
-
-`; - -exports[`ManualDeviceKeyVerificationDialog should display the device of another user 1`] = ` -
-
-