From d282416ea63553edefc18e6f1182d4d819c9555e Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 27 Sep 2024 14:06:50 -0400 Subject: [PATCH 1/6] Update docs to reflect that you can join calls without the labs flags --- docs/labs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 2135645941..4c373248bc 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -83,7 +83,7 @@ Enables sharing your current location to the timeline, with live updates. ## Video rooms (`feature_video_rooms`) -Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of. +Enables support for creating video rooms, which are persistent video chats that users can jump in and out of. ## Element Call video rooms (`feature_element_call_video_rooms`) [In Development] @@ -93,7 +93,7 @@ This flag will not have any effect unless `feature_video_rooms` is also enabled. ## New group call experience (`feature_group_calls`) [In Development] -This feature allows users to place and join native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call. +This feature allows users to place native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call. If you're enabling this at the deployment level, you may also want to reference the docs for the `element_call` config section. From 14dc9a0418e51b60896e20a73df0e9c427f443ba Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Oct 2024 11:59:43 +0000 Subject: [PATCH 2/6] Upgrade dependency to matrix-react-sdk@3.111.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 00d59ed758..ecc2a0b357 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.6.0", - "matrix-react-sdk": "3.110.0", + "matrix-react-sdk": "3.111.0", "matrix-widget-api": "^1.8.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index c8fc7173e7..60e2a8deee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,10 +8217,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.110.0: - version "3.110.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.110.0.tgz#cf31d8032dacd7d5521d4e3fef571947c94501dc" - integrity sha512-aJ4tuCwEErMsd4Yk1jNBUWjWECRI3k0m1MMSAc2Xj3QO4ry6oJCIOHra2nSUz3hKO5OC+DMMcGaPnVt1O+DUmA== +matrix-react-sdk@3.111.0: + version "3.111.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.111.0.tgz#88f3aff30ce8791d60e06540a951d1f3b9827b52" + integrity sha512-RrZYthV2W4nf/0cCRRrulU/kxK6KhERD6HqiWzm3Ilpo9slkeHsRJsjny1AMITMPuxfHm4B0j3Tlg1n8txQgQw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.25.0" From ec600991050f4e03f6f23669be53c7a1e03a0895 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Oct 2024 12:03:22 +0000 Subject: [PATCH 3/6] v1.11.79 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38b0fbd17d..7bd5b8282d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +Changes in [1.11.79](https://github.com/element-hq/element-web/releases/tag/v1.11.79) (2024-10-01) +================================================================================================== +* No changes + +## ✨ Features + +* [Backport staging] Allow joining calls and video rooms without enabling the labs flags ([#106](https://github.com/element-hq/matrix-react-sdk/pull/106)). Contributed by @RiotRobot. + + + Changes in [1.11.78](https://github.com/element-hq/element-web/releases/tag/v1.11.78) (2024-09-24) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index ecc2a0b357..7c7c21e670 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.78", + "version": "1.11.79", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 350b84a1595c74a12bb38df007fef1e5799fdde0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 1 Oct 2024 13:54:32 +0100 Subject: [PATCH 4/6] Separate out tasks for each merge in the Prepare Release script So it's easier to see which one failed. --- .github/workflows/release_prepare.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 35cdc000e1..8d27d5227b 100644 --- a/.github/workflows/release_prepare.yml +++ b/.github/workflows/release_prepare.yml @@ -70,11 +70,30 @@ jobs: fetch-tags: true token: ${{ secrets.ELEMENT_BOT_TOKEN }} - - name: Merge develop + - name: Merge Element Desktop + if: inputs.element-desktop run: | git config --global user.email "releases@riot.im" git config --global user.name "RiotRobot" - for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done + git -C "element-desktop" merge origin/develop + - name: Merge Element Web + if: inputs.element-web + run: | + git config --global user.email "releases@riot.im" + git config --global user.name "RiotRobot" + git -C "element-web" merge origin/develop + - name: Merge React SDK + if: inputs.matrix-react-sdk + run: | + git config --global user.email "releases@riot.im" + git config --global user.name "RiotRobot" + git -C "matrix-react-sdk" merge origin/develop + - name: Merge JS SDK + if: inputs.matrix-js-sdk + run: | + git config --global user.email "releases@riot.im" + git config --global user.name "RiotRobot" + git -C "matrix-js-sdk" merge origin/develop - name: Push staging run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done From 42be67e57ade05ba20e838dbbae3fab5d2e08e73 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 1 Oct 2024 14:06:03 +0100 Subject: [PATCH 5/6] Just run the git setup once --- .github/workflows/release_prepare.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 8d27d5227b..c021a0c3d3 100644 --- a/.github/workflows/release_prepare.yml +++ b/.github/workflows/release_prepare.yml @@ -70,29 +70,26 @@ jobs: fetch-tags: true token: ${{ secrets.ELEMENT_BOT_TOKEN }} - - name: Merge Element Desktop - if: inputs.element-desktop + - name: Prepare Git run: | git config --global user.email "releases@riot.im" git config --global user.name "RiotRobot" + + - name: Merge Element Desktop + if: inputs.element-desktop + run: | git -C "element-desktop" merge origin/develop - name: Merge Element Web if: inputs.element-web run: | - git config --global user.email "releases@riot.im" - git config --global user.name "RiotRobot" git -C "element-web" merge origin/develop - name: Merge React SDK if: inputs.matrix-react-sdk run: | - git config --global user.email "releases@riot.im" - git config --global user.name "RiotRobot" git -C "matrix-react-sdk" merge origin/develop - name: Merge JS SDK if: inputs.matrix-js-sdk run: | - git config --global user.email "releases@riot.im" - git config --global user.name "RiotRobot" git -C "matrix-js-sdk" merge origin/develop - name: Push staging From 013086cbaf8d0ff0c2d630dd7bfd588409e7eb7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:09:55 +0000 Subject: [PATCH 6/6] Update docker/build-push-action digest to 4f58ea7 --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 4b27351be4..c8bec61fea 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -65,7 +65,7 @@ jobs: - name: Build and push id: build-and-push - uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6 + uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6 with: context: . push: true