From f9cbdb8aa05e18da66de5c722837f4520c3f583e Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Tue, 2 Nov 2021 20:54:00 +0000
Subject: [PATCH 01/28] Update issue -> board automation (#19589)

Merge issues-to-projects and triage-needs-info into one under a new name
as they have the same trigger.

Add automation to move ex-needs info issues to triaged when labels are
updated.

Fixes #18523

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/issues_to_projects.yaml    | 36 --------------
 .github/workflows/triage-move-labelled.yml   | 50 ++++++++++++++++++++
 .github/workflows/triage-move-unlabelled.yml | 22 +++++++++
 .github/workflows/triage-needs-info.yml      | 16 -------
 4 files changed, 72 insertions(+), 52 deletions(-)
 delete mode 100644 .github/workflows/issues_to_projects.yaml
 create mode 100644 .github/workflows/triage-move-labelled.yml
 create mode 100644 .github/workflows/triage-move-unlabelled.yml
 delete mode 100644 .github/workflows/triage-needs-info.yml

diff --git a/.github/workflows/issues_to_projects.yaml b/.github/workflows/issues_to_projects.yaml
deleted file mode 100644
index d758a09bddc..00000000000
--- a/.github/workflows/issues_to_projects.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-on:
-    issues:
-        types: [labeled]
-jobs:
-    move_priority_design_issues:
-        name: Move priority X-Needs-Design issues to Design project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-             (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-              contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
-             (contains(github.event.issue.labels.*.name, 'S-Critical') ||
-              contains(github.event.issue.labels.*.name, 'S-Major') ||
-              contains(github.event.issue.labels.*.name, 'S-Minor'))
-        steps:
-             - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-               with:
-                 action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-                 project-url: "https://github.com/orgs/vector-im/projects/14"
-                 column-name: "📥 Inbox"
-                 label-name: "X-Needs-Design"
-
-    move_spaces_issues:
-        name: Move Spaces issues to Delight project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Spaces') ||
-            contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
-            contains(github.event.issue.labels.*.name, 'A-Subspaces')
-        steps:
-             - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-               with:
-                 action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-                 project-url: "https://github.com/orgs/vector-im/projects/6"
-                 column-name: "📥 Inbox"
-                 label-name: "A-Spaces"
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
new file mode 100644
index 00000000000..e8532d70422
--- /dev/null
+++ b/.github/workflows/triage-move-labelled.yml
@@ -0,0 +1,50 @@
+name: Move X-Needs-Info into Need info column in the Issue triage board
+
+on:
+  issues:
+    types: [labeled]
+    
+jobs:
+  move_needs_info_issues:
+    name: Move X-Needs-Info issues to Need info on triage board
+    runs-on: ubuntu-latest
+    steps:
+    - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+      with:
+        action-token: ${{ secrets.GITHUB_TOKEN }}
+        project-url: "https://github.com/vector-im/element-web/projects/27"
+        column-name: "Need info"
+        label-name: "X-Needs-Info"
+
+  move_priority_design_issues:
+    name: Move priority X-Needs-Design issues to Design project board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
+        (contains(github.event.issue.labels.*.name, 'S-Critical') ||
+         contains(github.event.issue.labels.*.name, 'S-Major') ||
+         contains(github.event.issue.labels.*.name, 'S-Minor'))
+    steps:
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/orgs/vector-im/projects/14"
+          column-name: "📥 Inbox"
+          label-name: "X-Needs-Design"
+
+  move_spaces_issues:
+    name: Move Spaces issues to Delight project board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+        contains(github.event.issue.labels.*.name, 'A-Subspaces')
+    steps:
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/orgs/vector-im/projects/6"
+          column-name: "📥 Inbox"
+          label-name: "A-Spaces"
diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
new file mode 100644
index 00000000000..05b056e080d
--- /dev/null
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -0,0 +1,22 @@
+name: Move unlabelled from needs info columns to triaged
+
+on:
+  issues:
+    types: [unlabeled]
+    
+jobs:
+  Move_Unabeled_Issue_On_Project_Board:
+    name: Move no longer X-Needs-Info issues to Triaged
+    runs-on: ubuntu-latest
+    if: >
+        ${{
+        (github.event.project_card.project_card.column_id == 15439170 ||
+        github.event.project_card.project_card.column_id == 16669396 ||
+        github.event.project_card.project_card.column_id == 16669398) &&
+        !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
+    steps:
+      - uses: alex-page/github-project-automation-plus@v0.8.1
+        with:
+          project: Issue triage
+          column: Triaged
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-needs-info.yml b/.github/workflows/triage-needs-info.yml
deleted file mode 100644
index d43b2a503d5..00000000000
--- a/.github/workflows/triage-needs-info.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Move X-Needs-Info into Need info column in the Issue triage board
-
-on:
-  issues:
-    types: [labeled]
-    
-jobs:
-  Move_Labeled_Issue_On_Project_Board:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-      with:
-        action-token: ${{ secrets.GITHUB_TOKEN }}
-        project-url: "https://github.com/vector-im/element-web/projects/27"
-        column-name: "Need info"
-        label-name: "X-Needs-Info"

From d9f72ec0b62d37d7864fe4df62258c027ee90d19 Mon Sep 17 00:00:00 2001
From: James Salter <iteration@gmail.com>
Date: Wed, 3 Nov 2021 09:55:28 +0000
Subject: [PATCH 02/28] Update minification and sourcemap settings on CI builds
 for sentry (#19583)

With previous settings, our JS files for develop are so large that sentry's webserver rejects the upload.

* re-enable minification to reduce the size of the files
* update the CI sourcemap setting from eval-source-map to source-map to move the embedded source out of the .js payload and into .js.map files
---
 webpack.config.js | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 6b40a100ca6..d761f18220b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,31 +40,34 @@ function getActiveThemes() {
 }
 
 module.exports = (env, argv) => {
-    let nodeEnv = argv.mode;
-    if (process.env.CI_PACKAGE) {
-        // Don't run minification for CI builds (this is only set for runs on develop)
-        // We override this via environment variable to avoid duplicating the scripts
-        // in `package.json` just for a different mode.
-        argv.mode = "development";
-
-        // More and more people are using nightly build as their main client
-        // Libraries like React have a development build that is useful
-        // when working on the app but adds significant runtime overhead
-        // We want to use the React production build but not compile the whole
-        // application to productions standards
-        nodeEnv = "production";
-    }
+    // Establish settings based on the environment and args.
+    //
+    // argv.mode is always set to "production" by yarn build
+    //      (called to build prod, nightly and develop.element.io)
+    // arg.mode is set to "delopment" by yarn start
+    //      (called by developers, runs the continuous reload script)
+    // process.env.CI_PACKAGE is set when yarn build is called from scripts/ci_package.sh
+    //      (called to build nightly and develop.element.io)
+    const nodeEnv = argv.mode;
     const devMode = nodeEnv !== 'production';
     const useHMR = process.env.CSS_HOT_RELOAD === '1' && devMode;
     const fullPageErrors = process.env.FULL_PAGE_ERRORS === '1' && devMode;
+    const enableMinification = !devMode;
 
     const development = {};
-    if (argv.mode === "production") {
-        development['devtool'] = 'nosources-source-map';
+    if (devMode) {
+        // High quality, embedded source maps for dev builds
+        development['devtool'] = "eval-source-map";
     } else {
-        // This makes the sourcemaps human readable for developers. We use eval-source-map
-        // because the plain source-map devtool ruins the alignment.
-        development['devtool'] = 'eval-source-map';
+        if (process.env.CI_PACKAGE) {
+            // High quality source maps in separate .map files which include the source. This doesn't bulk up the .js
+            // payload file size, which is nice for performance but also necessary to get the bundle to a small enough
+            // size that sentry will accept the upload.
+            development['devtool'] = 'source-map';
+        } else {
+            // High quality source maps in separate .map files which don't include the source
+            development['devtool'] = 'nosources-source-map';
+        }
     }
 
     // Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
@@ -126,8 +129,8 @@ module.exports = (env, argv) => {
 
             // Minification is normally enabled by default for webpack in production mode, but
             // we use a CSS optimizer too and need to manage it ourselves.
-            minimize: argv.mode === 'production',
-            minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
+            minimize: enableMinification,
+            minimizer: enableMinification ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
 
             // Set the value of `process.env.NODE_ENV` for libraries like React
             // See also https://v4.webpack.js.org/configuration/optimization/#optimizationnodeenv
@@ -540,7 +543,7 @@ module.exports = (env, argv) => {
             process.env.SENTRY_DSN &&
                 new SentryCliPlugin({
                     release: process.env.VERSION,
-                    include: "./webapp",
+                    include: "./webapp/bundles",
                 }),
             new webpack.EnvironmentPlugin(['VERSION']),
         ].filter(Boolean),

From c0a7437c20a3cde86483c8febc2e38999753544e Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Wed, 3 Nov 2021 12:42:46 +0000
Subject: [PATCH 03/28] Reference commits instead of tags in workflows (#19597)

This is better in case the tag is ever assigned to another commit.

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-incoming.yml        | 2 +-
 .github/workflows/triage-move-labelled.yml   | 6 +++---
 .github/workflows/triage-move-unlabelled.yml | 2 +-
 .github/workflows/triage-priority-bugs.yml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 5a9ce877278..f0c6e9856fc 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -8,7 +8,7 @@ jobs:
   automate-project-columns:
     runs-on: ubuntu-latest
     steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Issue triage
           column: Incoming
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index e8532d70422..c6b10ee0b19 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -9,7 +9,7 @@ jobs:
     name: Move X-Needs-Info issues to Need info on triage board
     runs-on: ubuntu-latest
     steps:
-    - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+    - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
       with:
         action-token: ${{ secrets.GITHUB_TOKEN }}
         project-url: "https://github.com/vector-im/element-web/projects/27"
@@ -27,7 +27,7 @@ jobs:
          contains(github.event.issue.labels.*.name, 'S-Major') ||
          contains(github.event.issue.labels.*.name, 'S-Minor'))
     steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
         with:
           action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
           project-url: "https://github.com/orgs/vector-im/projects/14"
@@ -42,7 +42,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
         contains(github.event.issue.labels.*.name, 'A-Subspaces')
     steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
         with:
           action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
           project-url: "https://github.com/orgs/vector-im/projects/6"
diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
index 05b056e080d..b8801dbe81e 100644
--- a/.github/workflows/triage-move-unlabelled.yml
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -15,7 +15,7 @@ jobs:
         github.event.project_card.project_card.column_id == 16669398) &&
         !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
     steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Issue triage
           column: Triaged
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index f941912d190..d9e1cf634b7 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -25,7 +25,7 @@ jobs:
          contains(github.event.issue.labels.*.name, 'A11y') &&
          contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Web App Team
           column: P1

From 516e38c82dad35d7f3ed0babe68d41cd124f0670 Mon Sep 17 00:00:00 2001
From: James Salter <iteration@gmail.com>
Date: Wed, 3 Nov 2021 13:09:25 +0000
Subject: [PATCH 04/28] Revert "Update minification and sourcemap settings on
 CI builds for sentry (#19583)" (#19601)

This reverts commit d9f72ec0b62d37d7864fe4df62258c027ee90d19.
---
 webpack.config.js | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index d761f18220b..6b40a100ca6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,34 +40,31 @@ function getActiveThemes() {
 }
 
 module.exports = (env, argv) => {
-    // Establish settings based on the environment and args.
-    //
-    // argv.mode is always set to "production" by yarn build
-    //      (called to build prod, nightly and develop.element.io)
-    // arg.mode is set to "delopment" by yarn start
-    //      (called by developers, runs the continuous reload script)
-    // process.env.CI_PACKAGE is set when yarn build is called from scripts/ci_package.sh
-    //      (called to build nightly and develop.element.io)
-    const nodeEnv = argv.mode;
+    let nodeEnv = argv.mode;
+    if (process.env.CI_PACKAGE) {
+        // Don't run minification for CI builds (this is only set for runs on develop)
+        // We override this via environment variable to avoid duplicating the scripts
+        // in `package.json` just for a different mode.
+        argv.mode = "development";
+
+        // More and more people are using nightly build as their main client
+        // Libraries like React have a development build that is useful
+        // when working on the app but adds significant runtime overhead
+        // We want to use the React production build but not compile the whole
+        // application to productions standards
+        nodeEnv = "production";
+    }
     const devMode = nodeEnv !== 'production';
     const useHMR = process.env.CSS_HOT_RELOAD === '1' && devMode;
     const fullPageErrors = process.env.FULL_PAGE_ERRORS === '1' && devMode;
-    const enableMinification = !devMode;
 
     const development = {};
-    if (devMode) {
-        // High quality, embedded source maps for dev builds
-        development['devtool'] = "eval-source-map";
+    if (argv.mode === "production") {
+        development['devtool'] = 'nosources-source-map';
     } else {
-        if (process.env.CI_PACKAGE) {
-            // High quality source maps in separate .map files which include the source. This doesn't bulk up the .js
-            // payload file size, which is nice for performance but also necessary to get the bundle to a small enough
-            // size that sentry will accept the upload.
-            development['devtool'] = 'source-map';
-        } else {
-            // High quality source maps in separate .map files which don't include the source
-            development['devtool'] = 'nosources-source-map';
-        }
+        // This makes the sourcemaps human readable for developers. We use eval-source-map
+        // because the plain source-map devtool ruins the alignment.
+        development['devtool'] = 'eval-source-map';
     }
 
     // Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
@@ -129,8 +126,8 @@ module.exports = (env, argv) => {
 
             // Minification is normally enabled by default for webpack in production mode, but
             // we use a CSS optimizer too and need to manage it ourselves.
-            minimize: enableMinification,
-            minimizer: enableMinification ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
+            minimize: argv.mode === 'production',
+            minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
 
             // Set the value of `process.env.NODE_ENV` for libraries like React
             // See also https://v4.webpack.js.org/configuration/optimization/#optimizationnodeenv
@@ -543,7 +540,7 @@ module.exports = (env, argv) => {
             process.env.SENTRY_DSN &&
                 new SentryCliPlugin({
                     release: process.env.VERSION,
-                    include: "./webapp/bundles",
+                    include: "./webapp",
                 }),
             new webpack.EnvironmentPlugin(['VERSION']),
         ].filter(Boolean),

From cb0f9022f943b9481416eb4b81433f5d48e66d1e Mon Sep 17 00:00:00 2001
From: James Salter <iteration@gmail.com>
Date: Wed, 3 Nov 2021 13:19:21 +0000
Subject: [PATCH 05/28] Sentry sourcemaps without CI minification (#19602)

* Revert "Revert "Update minification and sourcemap settings on CI builds for sentry (#19583)" (#19601)"

This reverts commit 516e38c82dad35d7f3ed0babe68d41cd124f0670.

* Disable minification in CI as it exceeds memory limits for poor buildkite
---
 webpack.config.js | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 6b40a100ca6..3aed2154c46 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,31 +40,34 @@ function getActiveThemes() {
 }
 
 module.exports = (env, argv) => {
-    let nodeEnv = argv.mode;
-    if (process.env.CI_PACKAGE) {
-        // Don't run minification for CI builds (this is only set for runs on develop)
-        // We override this via environment variable to avoid duplicating the scripts
-        // in `package.json` just for a different mode.
-        argv.mode = "development";
-
-        // More and more people are using nightly build as their main client
-        // Libraries like React have a development build that is useful
-        // when working on the app but adds significant runtime overhead
-        // We want to use the React production build but not compile the whole
-        // application to productions standards
-        nodeEnv = "production";
-    }
+    // Establish settings based on the environment and args.
+    //
+    // argv.mode is always set to "production" by yarn build
+    //      (called to build prod, nightly and develop.element.io)
+    // arg.mode is set to "delopment" by yarn start
+    //      (called by developers, runs the continuous reload script)
+    // process.env.CI_PACKAGE is set when yarn build is called from scripts/ci_package.sh
+    //      (called to build nightly and develop.element.io)
+    const nodeEnv = argv.mode;
     const devMode = nodeEnv !== 'production';
     const useHMR = process.env.CSS_HOT_RELOAD === '1' && devMode;
     const fullPageErrors = process.env.FULL_PAGE_ERRORS === '1' && devMode;
+    const enableMinification = !devMode && !process.env.CI_PACKAGE;
 
     const development = {};
-    if (argv.mode === "production") {
-        development['devtool'] = 'nosources-source-map';
+    if (devMode) {
+        // High quality, embedded source maps for dev builds
+        development['devtool'] = "eval-source-map";
     } else {
-        // This makes the sourcemaps human readable for developers. We use eval-source-map
-        // because the plain source-map devtool ruins the alignment.
-        development['devtool'] = 'eval-source-map';
+        if (process.env.CI_PACKAGE) {
+            // High quality source maps in separate .map files which include the source. This doesn't bulk up the .js
+            // payload file size, which is nice for performance but also necessary to get the bundle to a small enough
+            // size that sentry will accept the upload.
+            development['devtool'] = 'source-map';
+        } else {
+            // High quality source maps in separate .map files which don't include the source
+            development['devtool'] = 'nosources-source-map';
+        }
     }
 
     // Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
@@ -126,8 +129,8 @@ module.exports = (env, argv) => {
 
             // Minification is normally enabled by default for webpack in production mode, but
             // we use a CSS optimizer too and need to manage it ourselves.
-            minimize: argv.mode === 'production',
-            minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
+            minimize: enableMinification,
+            minimizer: enableMinification ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
 
             // Set the value of `process.env.NODE_ENV` for libraries like React
             // See also https://v4.webpack.js.org/configuration/optimization/#optimizationnodeenv
@@ -540,7 +543,7 @@ module.exports = (env, argv) => {
             process.env.SENTRY_DSN &&
                 new SentryCliPlugin({
                     release: process.env.VERSION,
-                    include: "./webapp",
+                    include: "./webapp/bundles",
                 }),
             new webpack.EnvironmentPlugin(['VERSION']),
         ].filter(Boolean),

From 06e855c6011e7d20dc7873d32b7a99aa368237d7 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Thu, 4 Nov 2021 10:44:33 +0000
Subject: [PATCH 06/28] Update workflow name to be correct (#19614)

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index c6b10ee0b19..41bb39015c1 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -1,4 +1,4 @@
-name: Move X-Needs-Info into Need info column in the Issue triage board
+name: Move labelled issues to correct boards and columns
 
 on:
   issues:

From ef87da52f4aa46e2ff74f67d0809185d79427454 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Thu, 4 Nov 2021 11:43:12 +0000
Subject: [PATCH 07/28] Workflow: use our special token instead of github
 (#19618)

This could fix the obscure "#ERROR# HttpError: Validation Failed" that
we're getting in failed actions.

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 41bb39015c1..99fb96a494f 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -9,12 +9,12 @@ jobs:
     name: Move X-Needs-Info issues to Need info on triage board
     runs-on: ubuntu-latest
     steps:
-    - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
-      with:
-        action-token: ${{ secrets.GITHUB_TOKEN }}
-        project-url: "https://github.com/vector-im/element-web/projects/27"
-        column-name: "Need info"
-        label-name: "X-Needs-Info"
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/vector-im/element-web/projects/27"
+          column-name: "Need info"
+          label-name: "X-Needs-Info"
 
   move_priority_design_issues:
     name: Move priority X-Needs-Design issues to Design project board

From addb6183b3364986d069a9ca3fb7751fdc857e1a Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Thu, 4 Nov 2021 15:45:28 +0000
Subject: [PATCH 08/28] Workflow: move voice message issues to their board
 (#19626)

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 99fb96a494f..04e08f12ba0 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -48,3 +48,17 @@ jobs:
           project-url: "https://github.com/orgs/vector-im/projects/6"
           column-name: "📥 Inbox"
           label-name: "A-Spaces"
+
+  move_voice-message_issues:
+    name: Move A-Voice Messages to Voice message board
+    runs-on: ubuntu-latest
+    if: >
+        ${{
+        contains(github.event.issue.labels.*.name, 'A-Voice Messages') }}
+    steps:
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/vector-im/element-web/projects/28"
+          column-name: "📥 Inbox"
+          label-name: "A-Voice Messages"

From 3d2880ddfb5e919343d195b5ac6735157fc22c04 Mon Sep 17 00:00:00 2001
From: Timo <16718859+toger5@users.noreply.github.com>
Date: Fri, 5 Nov 2021 12:43:43 +0100
Subject: [PATCH 09/28] Add docs for maximised widgets labs feature (#19628)

Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
---
 docs/labs.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/labs.md b/docs/labs.md
index 69ce263fab3..c954b2963c0 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -142,3 +142,10 @@ entirely incomplete and may not work at all - it is not recommended for general
 
 Bug reports, feature requests, etc are not currently accepted for this feature flag. A later stage of
 development will provide opportunities for feedback.
+
+## Maximised widgets (`feature_maximised_widgets`) [In Development]
+
+Maximised widgets provide a room layout in which a widget is (temporarily) the primary focus of the room. The whole chat area is then used for the widget. The chat is moved into the right panel.
+
+Note that this feature is currently under active development and therefore is
+entirely incomplete and may not work at all - it is not recommended for general use at this time.
\ No newline at end of file

From 0c3efaec9a8e1bbca481f6fd45d97e2ab7b1c93f Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Fri, 5 Nov 2021 16:32:19 +0000
Subject: [PATCH 10/28] Workflow: do a better check on X-Needs-Info (#19641)

Previous check doesn't really work.

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-unlabelled.yml | 21 ++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
index b8801dbe81e..94bd049b919 100644
--- a/.github/workflows/triage-move-unlabelled.yml
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -10,12 +10,25 @@ jobs:
     runs-on: ubuntu-latest
     if: >
         ${{
-        (github.event.project_card.project_card.column_id == 15439170 ||
-        github.event.project_card.project_card.column_id == 16669396 ||
-        github.event.project_card.project_card.column_id == 16669398) &&
         !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
+    env:
+      BOARD_NAME: "Issue triage"
+      OWNER: ${{ github.repository_owner }}
+      REPO: ${{ github.event.repository.name }}
+      ISSUE: ${{ github.event.issue.number }}
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - name: Check if issue is already in "${{ env.BOARD_NAME }}"
+        run: |
+          if curl -i -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql | grep "\b$BOARD_NAME\b"; then
+            echo "Issue is already in Project '$BOARD_NAME', proceeding";
+            echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
+          else
+            echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
+            echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
+          fi
+      - name: Move issue
+        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        if: ${{ env.ALREADY_IN_BOARD == 'true' }}
         with:
           project: Issue triage
           column: Triaged

From 8c227f61ddc4a31407321b13d57906ad7076d79c Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Fri, 5 Nov 2021 21:12:49 +0000
Subject: [PATCH 11/28] Update design team workflow to use beta board (#19647)

Try sending design issues to the beta board

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 04e08f12ba0..3ac8777558b 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -16,23 +16,35 @@ jobs:
           column-name: "Need info"
           label-name: "X-Needs-Info"
 
-  move_priority_design_issues:
+  add_priority_design_issues_to_project:
     name: Move priority X-Needs-Design issues to Design project board
     runs-on: ubuntu-latest
     if: >
+        ${{
         contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
          contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
         (contains(github.event.issue.labels.*.name, 'S-Critical') ||
          contains(github.event.issue.labels.*.name, 'S-Major') ||
-         contains(github.event.issue.labels.*.name, 'S-Minor'))
+         contains(github.event.issue.labels.*.name, 'S-Minor')) }}
     steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
         with:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/orgs/vector-im/projects/14"
-          column-name: "📥 Inbox"
-          label-name: "X-Needs-Design"
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_spaces_issues:
     name: Move Spaces issues to Delight project board

From 0317e39ef7d4d4bc355512404128591ecc92d9e0 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Mon, 8 Nov 2021 12:17:20 +0000
Subject: [PATCH 12/28] Move P1 issues to crypto team board (#19654)

Move high priority issues which have an E2EE label to the crypto team
org level old style project board.

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-priority-bugs.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index d9e1cf634b7..8cd34c01383 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -31,3 +31,25 @@ jobs:
           column: P1
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
+  Move_high_priority_issues_to_crypto_team_workboard:
+    runs-on: ubuntu-latest
+    if: >
+        (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+         contains(github.event.issue.labels.*.name, 'S-Critical') &&
+         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+         contains(github.event.issue.labels.*.name, 'S-Major') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'A11y') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: Crypto Team
+          column: Ready
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

From 2ef1191afa89d0fa55584bbc31d12978ede811fb Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Mon, 8 Nov 2021 14:44:05 +0000
Subject: [PATCH 13/28] Move Spaces issues to new Delight board (#19661)

Keep automation for old board too as we haven't moved the team yet

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 3ac8777558b..5d2a56d471d 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -60,6 +60,23 @@ jobs:
           project-url: "https://github.com/orgs/vector-im/projects/6"
           column-name: "📥 Inbox"
           label-name: "A-Spaces"
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_delight2
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc1HvQ"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_voice-message_issues:
     name: Move A-Voice Messages to Voice message board

From 4158a49297974204b2b51072b5a84b778321514f Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Mon, 8 Nov 2021 14:44:22 +0000
Subject: [PATCH 14/28] Fix conditional check before moving design issues
 (#19658)

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 5d2a56d471d..48fd23890f4 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -20,13 +20,14 @@ jobs:
     name: Move priority X-Needs-Design issues to Design project board
     runs-on: ubuntu-latest
     if: >
-        ${{
         contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+        contains(github.event.issue.labels.*.name, 'S-Critical') &&
         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
-        (contains(github.event.issue.labels.*.name, 'S-Critical') ||
-         contains(github.event.issue.labels.*.name, 'S-Major') ||
-         contains(github.event.issue.labels.*.name, 'S-Minor')) }}
+         contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent')
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project

From 88bd3e41d0f045f2d519c7e7603c108544426338 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 8 Nov 2021 18:06:48 +0000
Subject: [PATCH 15/28] Reset  back to develop branch

---
 package.json |  4 ++--
 yarn.lock    | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index b517b0e11aa..a452ed7c612 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,8 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "15.1.0",
-    "matrix-react-sdk": "3.34.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.17",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index d00817227d2..475ccaf653e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7854,10 +7854,9 @@ 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@15.1.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "15.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.0.tgz#46bb1185e80d1c9aeccf290bc214a0ad27351aa3"
-  integrity sha512-1qF6RO3jrMdL2X7WsHW520oHMH6ns3rOkhdJi3PAYknCG8Yv87KCyI46o+7OgdBUTH2a+iwMcH8kP3T9/abKEA==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dc899ba6ec52cab3fed9783e892e62ffc93c5a7"
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -7878,10 +7877,9 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.34.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.34.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.34.0.tgz#e46e8f895348b7f4af1f9ee4e3c1fbc17f4832e9"
-  integrity sha512-2Ey9DQ9AYT0SdShCmw95VXbtIsQWfi3rFq15zY2FM0JQpIhfqFADlN/0thcqqC5tccX9UXjBJ6NLjsTyJKWaKA==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/06e1f8ce856cc725ddf44f6a104bae4e5879ef99"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -7912,7 +7910,7 @@ matrix-react-sdk@3.34.0:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "15.1.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^0.1.0-beta.17"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 28f00498a2b2f6f4dc529613a81ac9754c553a73 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Tue, 9 Nov 2021 15:10:19 +0000
Subject: [PATCH 16/28] Actions: use new voice message board for issues
 (#19670)

Voice-Messages are moving to org-level beta board so add automation to
send issues there (will remove old board automation after the move).

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 48fd23890f4..9feb237d111 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -92,3 +92,20 @@ jobs:
           project-url: "https://github.com/vector-im/element-web/projects/28"
           column-name: "📥 Inbox"
           label-name: "A-Voice Messages"
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_voice
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc2KCw"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

From 8e279116ae34dba910b6743a8e8d6bb3fbc1ac46 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Wed, 10 Nov 2021 16:42:18 +0000
Subject: [PATCH 17/28] Update triage workflow to fix conditional (#19682)

Docs say to use curly brackets, internet says that can break
multiline conditionals.

Trying to fix the if statement applying only to the first step in the job and
the second step ignoring the conditional.

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
---
 .github/workflows/triage-move-labelled.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 9feb237d111..5cf5b78a5ae 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -83,8 +83,7 @@ jobs:
     name: Move A-Voice Messages to Voice message board
     runs-on: ubuntu-latest
     if: >
-        ${{
-        contains(github.event.issue.labels.*.name, 'A-Voice Messages') }}
+        contains(github.event.issue.labels.*.name, 'A-Voice Messages')
     steps:
       - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
         with:

From 8e58d31db35f4fa9d17ab23ee1accd6b6d032793 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Nov 2021 13:07:47 +0000
Subject: [PATCH 18/28] Document feature_spaces_metaspaces (#19679)

Co-authored-by: Jonathan de Jong <jonathandejong02@gmail.com>
---
 docs/labs.md                   | 7 ++++++-
 element.io/develop/config.json | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/labs.md b/docs/labs.md
index c954b2963c0..1cb1b790718 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -148,4 +148,9 @@ development will provide opportunities for feedback.
 Maximised widgets provide a room layout in which a widget is (temporarily) the primary focus of the room. The whole chat area is then used for the widget. The chat is moved into the right panel.
 
 Note that this feature is currently under active development and therefore is
-entirely incomplete and may not work at all - it is not recommended for general use at this time.
\ No newline at end of file
+entirely incomplete and may not work at all - it is not recommended for general use at this time.
+
+## Metaspaces (`feature_spaces_metaspaces`) [In Development]
+
+Metaspaces are automatically populated spaces you can enable in your Space panel.
+By default, you'll have Home or All rooms, but you can opt in to a People, Favourites, and Other Rooms metaspace too.
diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index 6aea054c2f2..3f7900a3469 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -56,5 +56,8 @@
     "posthog": {
         "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
         "apiHost": "https://posthog.hss.element.io"
+    },
+    "features": {
+        "feature_spaces_metaspaces": true
     }
 }

From 12a42499a7161549c1a185e7f7d2216726782dbe Mon Sep 17 00:00:00 2001
From: Element Translate Bot <admin@riot.im>
Date: Mon, 15 Nov 2021 16:32:53 +0100
Subject: [PATCH 19/28] Translations update from Weblate (#19759)

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/

* Translated using Weblate (Vietnamese)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/

Co-authored-by: Linerly <linerly@protonmail.com>
Co-authored-by: Weblate <translate@riot.im>
Co-authored-by: Dinh Quang Tuyen <tuyen.dinh@aarenet.com>
Co-authored-by: Ege <alikemal@riseup.net>
---
 src/i18n/strings/tr.json | 4 ++--
 src/i18n/strings/vi.json | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index d45526ec899..b1d34615eea 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -8,10 +8,10 @@
     "Sign In": "Giriş Yap",
     "Create Account": "Hesap Oluştur",
     "Explore rooms": "Odaları keşfet",
-    "Invalid JSON": "JSON geçersiz",
+    "Invalid JSON": "Hatalı JSON",
     "Unexpected error preparing the app. See console for details.": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Hatalı ayarlar: default_server_config, default_server_name ve default_hs_url ayarlarından en fazla biri girilebilir.",
-    "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş.",
+    "Invalid configuration: no default server specified.": "Hatalı ayarlar: varsayılan sunucu belirlenmemiş.",
     "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s",
     "Go to your browser to complete Sign In": "Oturum açmayı tamamlamak için tarayıcınıza gidin",
     "Open user settings": "Kullanıcı ayarlarını aç",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 6547c6f79fe..ac6abd6c0e0 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -33,5 +33,6 @@
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Missing indexeddb worker script!": "Thiếu tệp lệnh làm việc của indexeddb!",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn chứa JSON không hợp lệ. Vui lòng sửa vấn đề và tải lại trang.",
-    "Your Element is misconfigured": "Element của bạn bị thiết lập sai"
+    "Your Element is misconfigured": "Element của bạn bị thiết lập sai",
+    "Switch to space by number": "Chuyển sang Space bằng số"
 }

From b2e8f212e4101c0543a5bac7e88586e2cc0628b2 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Tue, 16 Nov 2021 14:04:11 +0000
Subject: [PATCH 20/28] Issue automation workflow updates (#19767)

* Add automation to move Threads issues

Fixes #19732

* Rename triage workflows to be more consistent
---
 .github/workflows/triage-move-labelled.yml | 23 ++++++++++++++++++++++
 .github/workflows/triage-priority-bugs.yml |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 5cf5b78a5ae..b6147c15010 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -108,3 +108,26 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_threads_issues:
+    name: Move A-Threads to Thread board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Threads')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0rRA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index 8cd34c01383..d67afcdfbaa 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -5,7 +5,7 @@ on:
     types: [labeled, unlabeled]
 
 jobs:
-  Move_high_priority_issues_to_team_workboard:
+  p1_issues_to_team_workboard:
     runs-on: ubuntu-latest
     if: >
         (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
@@ -31,7 +31,7 @@ jobs:
           column: P1
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-  Move_high_priority_issues_to_crypto_team_workboard:
+  P1_issues_to_crypto_team_workboard:
     runs-on: ubuntu-latest
     if: >
         (contains(github.event.issue.labels.*.name, 'A-E2EE') ||

From 82ddf8da9953707d56d63ca58c910bff6b3ab882 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 17 Nov 2021 14:18:06 +0000
Subject: [PATCH 21/28] Upgrade matrix-js-sdk to 15.1.1-rc.1

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a452ed7c612..f794b56a803 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "15.1.1-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.17",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 475ccaf653e..56c9f2d6c36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7854,6 +7854,22 @@ 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@15.1.1-rc.1:
+  version "15.1.1-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1-rc.1.tgz#64c3b80cfa613ad415f779aa262f8cdd1bf582dc"
+  integrity sha512-b7shzZXwm1UCClvNxzuEpSInihI8fZSiEuKf/WaW+ITlcavVfhzXdogs6trrLBHS7/qP9gbNF781t/Q+APjDpQ==
+  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"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "15.1.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dc899ba6ec52cab3fed9783e892e62ffc93c5a7"

From 9e1d72122e2a6c97fd8e834ff27fcd6ef9bf6082 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 17 Nov 2021 14:18:54 +0000
Subject: [PATCH 22/28] Upgrade matrix-react-sdk to 3.35.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 24 +++++-------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index f794b56a803..05ab561d82e 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "15.1.1-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.35.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.17",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 56c9f2d6c36..31d38ef85c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7870,21 +7870,6 @@ matrix-js-sdk@15.1.1-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "15.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dc899ba6ec52cab3fed9783e892e62ffc93c5a7"
-  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"
-    p-retry "^4.5.0"
-    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"
@@ -7893,9 +7878,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 "3.34.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/06e1f8ce856cc725ddf44f6a104bae4e5879ef99"
+matrix-react-sdk@3.35.0-rc.1:
+  version "3.35.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.35.0-rc.1.tgz#0b8eaba4f9275db65ea5af2e9897b8d2e3ca87d8"
+  integrity sha512-ctC/2sApQpLLx2eKms7ho456OL3rz8ng2gV0Mq9Ax2K7z5DiNW5ZBTOKiuDyQ3EDSeN7ErY9ET3GDoLfltcsaA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -7926,7 +7912,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "15.1.1-rc.1"
     matrix-widget-api "^0.1.0-beta.17"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 0dee9d78a5d0b3fbc461ff87795f7076cf653112 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 17 Nov 2021 14:22:30 +0000
Subject: [PATCH 23/28] Prepare changelog for v1.9.5-rc.1

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ec3e5c9d29..f2b3459f1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+Changes in [1.9.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.9.5-rc.1) (2021-11-17)
+=======================================================================================================
+
+## ✨ Features
+ * Make double-clicking the PiP take you to the call room ([\#7142](https://github.com/matrix-org/matrix-react-sdk/pull/7142)). Fixes #18421 #15920 and #18421. Contributed by @SimonBrandner.
+ * Add maximise widget functionality ([\#7098](https://github.com/matrix-org/matrix-react-sdk/pull/7098)). Fixes #19619, #19621 #19760 and #19619.
+ * Add rainfall effect ([\#7086](https://github.com/matrix-org/matrix-react-sdk/pull/7086)). Contributed by @justjosias.
+ * Add root folder to zip file created by export chat feature ([\#7097](https://github.com/matrix-org/matrix-react-sdk/pull/7097)). Fixes #19653 and #19653. Contributed by @aaronraimist.
+ * Improve VoIP UI/UX ([\#7048](https://github.com/matrix-org/matrix-react-sdk/pull/7048)). Fixes #19513 and #19513. Contributed by @SimonBrandner.
+ * Unified room context menus ([\#7072](https://github.com/matrix-org/matrix-react-sdk/pull/7072)). Fixes #19527 and #19527.
+ * In forgot password screen, show validation errors inline in the form, instead of in modals ([\#7113](https://github.com/matrix-org/matrix-react-sdk/pull/7113)). Contributed by @psrpinto.
+ * Implement more meta-spaces ([\#7077](https://github.com/matrix-org/matrix-react-sdk/pull/7077)). Fixes #18634 #17295 and #18634.
+ * Expose power level control for m.space.child ([\#7120](https://github.com/matrix-org/matrix-react-sdk/pull/7120)).
+ * Forget member-list query when switching out of a room ([\#7093](https://github.com/matrix-org/matrix-react-sdk/pull/7093)). Fixes #19432 and #19432. Contributed by @SimonBrandner.
+ * Do pre-submit availability check on username during registration ([\#6978](https://github.com/matrix-org/matrix-react-sdk/pull/6978)). Fixes #9545 and #9545.
+
+## 🐛 Bug Fixes
+ * Adjust recovery key button sizes depending on text width ([\#7134](https://github.com/matrix-org/matrix-react-sdk/pull/7134)). Fixes #19511 and #19511. Contributed by @weeman1337.
+ * Fix bulk invite button getting a negative count ([\#7122](https://github.com/matrix-org/matrix-react-sdk/pull/7122)). Fixes #19466 and #19466. Contributed by @renancleyson-dev.
+ * Fix maximised / pinned widget state being loaded correctly ([\#7146](https://github.com/matrix-org/matrix-react-sdk/pull/7146)). Fixes #19768 and #19768.
+ * Don't reload the page when user hits enter when entering ban reason ([\#7145](https://github.com/matrix-org/matrix-react-sdk/pull/7145)). Fixes #19763 and #19763.
+ * Fix timeline text when sharing room layout ([\#7140](https://github.com/matrix-org/matrix-react-sdk/pull/7140)). Fixes #19622 and #19622.
+ * Fix look of emoji verification ([\#7133](https://github.com/matrix-org/matrix-react-sdk/pull/7133)). Fixes #19740 and #19740. Contributed by @SimonBrandner.
+ * Fixes element not remembering widget hidden state per room ([\#7136](https://github.com/matrix-org/matrix-react-sdk/pull/7136)). Fixes #16672, matrix-org/element-web-rageshakes#4407, #15718 #15768 and #16672.
+ * Don't keep spinning if joining space child failed ([\#7129](https://github.com/matrix-org/matrix-react-sdk/pull/7129)). Fixes matrix-org/element-web-rageshakes#6813 and matrix-org/element-web-rageshakes#6813.
+ * Guard around SpaceStore onAccountData handler prevEvent ([\#7123](https://github.com/matrix-org/matrix-react-sdk/pull/7123)). Fixes #19705 and #19705.
+ * Fix missing spaces in threads copy ([\#7119](https://github.com/matrix-org/matrix-react-sdk/pull/7119)). Fixes #19702 and #19702.
+ * Fix hover tile border ([\#7117](https://github.com/matrix-org/matrix-react-sdk/pull/7117)). Fixes #19698 and #19698. Contributed by @SimonBrandner.
+ * Fix quote button ([\#7096](https://github.com/matrix-org/matrix-react-sdk/pull/7096)). Fixes #19659 and #19659. Contributed by @SimonBrandner.
+ * Fix space panel layout edge cases ([\#7101](https://github.com/matrix-org/matrix-react-sdk/pull/7101)). Fixes #19668 and #19668.
+ * Update powerlevel/role when the user changes in the user info panel ([\#7099](https://github.com/matrix-org/matrix-react-sdk/pull/7099)). Fixes #19666 and #19666. Contributed by @SimonBrandner.
+ * Fix avatar disappearing when setting a room topic ([\#7092](https://github.com/matrix-org/matrix-react-sdk/pull/7092)). Fixes #19226 and #19226. Contributed by @SimonBrandner.
+ * Fix possible infinite loop on widget start ([\#7071](https://github.com/matrix-org/matrix-react-sdk/pull/7071)). Fixes #15494 and #15494.
+ * Use device IDs for nameless devices in device list ([\#7081](https://github.com/matrix-org/matrix-react-sdk/pull/7081)). Fixes #19608 and #19608.
+ * Don't re-sort rooms on no-op RoomUpdateCause.PossibleTagChange ([\#7053](https://github.com/matrix-org/matrix-react-sdk/pull/7053)). Contributed by @bradtgmurray.
+
 Changes in [1.9.4](https://github.com/vector-im/element-web/releases/tag/v1.9.4) (2021-11-08)
 =============================================================================================
 

From 0ad25f41ff3e3d9c8231fc40656fb3f592b46525 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 17 Nov 2021 14:22:30 +0000
Subject: [PATCH 24/28] v1.9.5-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05ab561d82e..e3cddc9fbda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.9.4",
+  "version": "1.9.5-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 08c164a8517a4c6492537e24a7740e4b0f6da6ad Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 22 Nov 2021 14:32:54 +0000
Subject: [PATCH 25/28] Upgrade matrix-js-sdk to 15.1.1

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3cddc9fbda..825568f971d 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "15.1.1-rc.1",
+    "matrix-js-sdk": "15.1.1",
     "matrix-react-sdk": "3.35.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.17",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 31d38ef85c8..cfcdbfb5209 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7854,6 +7854,22 @@ 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@15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1.tgz#791aefb2c68e1e8d398beee3eedcb6c23b63315d"
+  integrity sha512-tKZQLFwYMQk2G4nmLNR0cDDXcfDkdzJGyg2S15HooB2aI7/Ev9PhCczkw+xzwhJusxzfa8j+yx52KjMXUb81WQ==
+  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"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@15.1.1-rc.1:
   version "15.1.1-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1-rc.1.tgz#64c3b80cfa613ad415f779aa262f8cdd1bf582dc"

From c8ca48c79eaac00f1628830394ea2b1dd610fdbf Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 22 Nov 2021 14:33:18 +0000
Subject: [PATCH 26/28] Upgrade matrix-react-sdk to 3.35.1

---
 package.json |  2 +-
 yarn.lock    | 26 +++++---------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 825568f971d..6ba9e3467d5 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "15.1.1",
-    "matrix-react-sdk": "3.35.0-rc.1",
+    "matrix-react-sdk": "3.35.1",
     "matrix-widget-api": "^0.1.0-beta.17",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index cfcdbfb5209..b673a4fba48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7870,22 +7870,6 @@ matrix-js-sdk@15.1.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@15.1.1-rc.1:
-  version "15.1.1-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1-rc.1.tgz#64c3b80cfa613ad415f779aa262f8cdd1bf582dc"
-  integrity sha512-b7shzZXwm1UCClvNxzuEpSInihI8fZSiEuKf/WaW+ITlcavVfhzXdogs6trrLBHS7/qP9gbNF781t/Q+APjDpQ==
-  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"
-    p-retry "^4.5.0"
-    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"
@@ -7894,10 +7878,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.35.0-rc.1:
-  version "3.35.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.35.0-rc.1.tgz#0b8eaba4f9275db65ea5af2e9897b8d2e3ca87d8"
-  integrity sha512-ctC/2sApQpLLx2eKms7ho456OL3rz8ng2gV0Mq9Ax2K7z5DiNW5ZBTOKiuDyQ3EDSeN7ErY9ET3GDoLfltcsaA==
+matrix-react-sdk@3.35.1:
+  version "3.35.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.35.1.tgz#e5773633d26d83dfbb839ad29f83c06abd70752f"
+  integrity sha512-pX7sZ4LNWznYQ3eCfXXWQWcUSQy3pjxQ03VAiTxpJcXhSvHuK2iCtxMXCUObhr9vO1YqaiyJS5UMnT7+n1Q7gw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -7928,7 +7912,7 @@ matrix-react-sdk@3.35.0-rc.1:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "15.1.1-rc.1"
+    matrix-js-sdk "15.1.1"
     matrix-widget-api "^0.1.0-beta.17"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 2995894055143b8357fdf39b3af1b32c43fa42fc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 22 Nov 2021 14:37:17 +0000
Subject: [PATCH 27/28] Prepare changelog for v1.9.5

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2b3459f1bd..bc04c09570f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+Changes in [1.9.5](https://github.com/vector-im/element-web/releases/tag/v1.9.5) (2021-11-22)
+=============================================================================================
+
+## ✨ Features
+ * Make double-clicking the PiP take you to the call room ([\#7142](https://github.com/matrix-org/matrix-react-sdk/pull/7142)). Fixes #18421 #15920 and #18421. Contributed by @SimonBrandner.
+ * Add maximise widget functionality ([\#7098](https://github.com/matrix-org/matrix-react-sdk/pull/7098)). Fixes #19619, #19621 #19760 and #19619.
+ * Add rainfall effect ([\#7086](https://github.com/matrix-org/matrix-react-sdk/pull/7086)). Contributed by @justjosias.
+ * Add root folder to zip file created by export chat feature ([\#7097](https://github.com/matrix-org/matrix-react-sdk/pull/7097)). Fixes #19653 and #19653. Contributed by @aaronraimist.
+ * Improve VoIP UI/UX ([\#7048](https://github.com/matrix-org/matrix-react-sdk/pull/7048)). Fixes #19513 and #19513. Contributed by @SimonBrandner.
+ * Unified room context menus ([\#7072](https://github.com/matrix-org/matrix-react-sdk/pull/7072)). Fixes #19527 and #19527.
+ * In forgot password screen, show validation errors inline in the form, instead of in modals ([\#7113](https://github.com/matrix-org/matrix-react-sdk/pull/7113)). Contributed by @psrpinto.
+ * Implement more meta-spaces ([\#7077](https://github.com/matrix-org/matrix-react-sdk/pull/7077)). Fixes #18634 #17295 and #18634.
+ * Expose power level control for m.space.child ([\#7120](https://github.com/matrix-org/matrix-react-sdk/pull/7120)).
+ * Forget member-list query when switching out of a room ([\#7093](https://github.com/matrix-org/matrix-react-sdk/pull/7093)). Fixes #19432 and #19432. Contributed by @SimonBrandner.
+ * Do pre-submit availability check on username during registration ([\#6978](https://github.com/matrix-org/matrix-react-sdk/pull/6978)). Fixes #9545 and #9545.
+
+## 🐛 Bug Fixes
+ * Adjust recovery key button sizes depending on text width ([\#7134](https://github.com/matrix-org/matrix-react-sdk/pull/7134)). Fixes #19511 and #19511. Contributed by @weeman1337.
+ * Fix bulk invite button getting a negative count ([\#7122](https://github.com/matrix-org/matrix-react-sdk/pull/7122)). Fixes #19466 and #19466. Contributed by @renancleyson-dev.
+ * Fix maximised / pinned widget state being loaded correctly ([\#7146](https://github.com/matrix-org/matrix-react-sdk/pull/7146)). Fixes #19768 and #19768.
+ * Don't reload the page when user hits enter when entering ban reason ([\#7145](https://github.com/matrix-org/matrix-react-sdk/pull/7145)). Fixes #19763 and #19763.
+ * Fix timeline text when sharing room layout ([\#7140](https://github.com/matrix-org/matrix-react-sdk/pull/7140)). Fixes #19622 and #19622.
+ * Fix look of emoji verification ([\#7133](https://github.com/matrix-org/matrix-react-sdk/pull/7133)). Fixes #19740 and #19740. Contributed by @SimonBrandner.
+ * Fixes element not remembering widget hidden state per room ([\#7136](https://github.com/matrix-org/matrix-react-sdk/pull/7136)). Fixes #16672, matrix-org/element-web-rageshakes#4407, #15718 #15768 and #16672.
+ * Don't keep spinning if joining space child failed ([\#7129](https://github.com/matrix-org/matrix-react-sdk/pull/7129)). Fixes matrix-org/element-web-rageshakes#6813 and matrix-org/element-web-rageshakes#6813.
+ * Guard around SpaceStore onAccountData handler prevEvent ([\#7123](https://github.com/matrix-org/matrix-react-sdk/pull/7123)). Fixes #19705 and #19705.
+ * Fix missing spaces in threads copy ([\#7119](https://github.com/matrix-org/matrix-react-sdk/pull/7119)). Fixes #19702 and #19702.
+ * Fix hover tile border ([\#7117](https://github.com/matrix-org/matrix-react-sdk/pull/7117)). Fixes #19698 and #19698. Contributed by @SimonBrandner.
+ * Fix quote button ([\#7096](https://github.com/matrix-org/matrix-react-sdk/pull/7096)). Fixes #19659 and #19659. Contributed by @SimonBrandner.
+ * Fix space panel layout edge cases ([\#7101](https://github.com/matrix-org/matrix-react-sdk/pull/7101)). Fixes #19668 and #19668.
+ * Update powerlevel/role when the user changes in the user info panel ([\#7099](https://github.com/matrix-org/matrix-react-sdk/pull/7099)). Fixes #19666 and #19666. Contributed by @SimonBrandner.
+ * Fix avatar disappearing when setting a room topic ([\#7092](https://github.com/matrix-org/matrix-react-sdk/pull/7092)). Fixes #19226 and #19226. Contributed by @SimonBrandner.
+ * Fix possible infinite loop on widget start ([\#7071](https://github.com/matrix-org/matrix-react-sdk/pull/7071)). Fixes #15494 and #15494.
+ * Use device IDs for nameless devices in device list ([\#7081](https://github.com/matrix-org/matrix-react-sdk/pull/7081)). Fixes #19608 and #19608.
+ * Don't re-sort rooms on no-op RoomUpdateCause.PossibleTagChange ([\#7053](https://github.com/matrix-org/matrix-react-sdk/pull/7053)). Contributed by @bradtgmurray.
+
 Changes in [1.9.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.9.5-rc.1) (2021-11-17)
 =======================================================================================================
 

From d443787608c9df252f9c4b31f2697c0d5fdc8cf1 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 22 Nov 2021 14:37:18 +0000
Subject: [PATCH 28/28] v1.9.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ba9e3467d5..a45e2e1d377 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.9.5-rc.1",
+  "version": "1.9.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {