From ad092508f83ad2affccbd4045205bcd02a1d4ab7 Mon Sep 17 00:00:00 2001
From: Feroli <feroli@tuta.io>
Date: Thu, 12 Jan 2023 19:53:09 +0000
Subject: [PATCH 01/24] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/
---
 src/i18n/strings/pt_BR.json | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 298a3164401..e12239c55ec 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -10,8 +10,8 @@
     "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o app. Veja console para detalhes.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar um de default_server_config, default_server_name, ou default_hs_url.",
     "Invalid configuration: no default server specified.": "Configuração inválida: nenhum servidor default especificado.",
-    "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de config: por favor atualize a página para tentar de novo.",
-    "Download Completed": "Download Completado",
+    "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de configuração: por favor atualize a página para tentar de novo.",
+    "Download Completed": "Download Concluído",
     "Unsupported browser": "Browser insuportado",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para a melhor experiência.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Você pode continuar usando seu browser atual, mas alguma ou toda funcionalidade pode não funcionar e a aparência e sensação do aplicativo pode estar incorretas.",
@@ -19,12 +19,14 @@
     "Go to element.io": "Ir para element.io",
     "Failed to start": "Falha para iniciar",
     "Open": "Abrir",
-    "Go to your browser to complete Sign In": "Vá para seu browser para completar Sign In",
-    "Your Element is misconfigured": "Seu Element está malconfigurado",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração de Element contém JSON inválido. Por favor corrija o problema e recarregue a página.",
+    "Go to your browser to complete Sign In": "Vá em seu navegador para completar o Registro",
+    "Your Element is misconfigured": "Seu Element está mal configurado",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor corrija o problema e recarregue a página.",
     "Your browser can't run %(brand)s": "Seu browser não consegue rodar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidade de browser avançada que não é suportada por seu browser atual.",
     "Powered by Matrix": "Powered by Matrix",
     "Use %(brand)s on mobile": "Usar %(brand)s em celular",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado & colaboração, powered by $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado & colaboração, powered by $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s em %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }

From 03c2a101f366b81e2126b8fb0d57bdeabb6c9466 Mon Sep 17 00:00:00 2001
From: Ali-x98 <ahj696@hotmail.com>
Date: Wed, 18 Jan 2023 17:07:23 +0000
Subject: [PATCH 02/24] Translated using Weblate (Arabic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ar/
---
 src/i18n/strings/ar.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 697db4c1655..55c6f122b18 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -26,5 +26,7 @@
     "Failed to start": "فشل البدء",
     "Powered by Matrix": "تدعمه «ماترِكس»",
     "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "محادثة لامركزية، مشفرة &amp; تعمل بواسطة $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "محادثة لامركزية، مشفرة &amp; تعمل بواسطة $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s في %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s سطح المكتب %(platformName)s"
 }

From 55afed3897fdead2eee20c3838fcc3133b8bc73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Thu, 19 Jan 2023 10:41:06 +0000
Subject: [PATCH 03/24] Translated using Weblate (Hungarian)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/
---
 src/i18n/strings/hu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 861c2ecec16..1fe5ba0297e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -6,7 +6,7 @@
     "Create Account": "Fiók létrehozása",
     "Explore rooms": "Szobák felderítése",
     "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért lásd a konzolt.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: csak egyet lehet megadni a default_server_config, default_server_name és default_hs_url közül.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: ezek közül csak egyet lehet megadni: default_server_config, default_server_name és default_hs_url.",
     "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett kiszolgáló.",
     "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s",
     "Invalid JSON": "Érvénytelen JSON",

From 2e6ecc832e3ceacba19496293257751c132aff21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 23 Jan 2023 10:18:26 +0000
Subject: [PATCH 04/24] Translated using Weblate (Icelandic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/
---
 src/i18n/strings/is.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index afb854c038f..50be151fc61 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -26,5 +26,7 @@
     "Invalid configuration: no default server specified.": "Ógild uppsetning: enginn sjálfgefinn vefþjónn tilgreindur.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ógild uppsetning: getur aðeins tilgreint eitt af default_server_config, default_server_name eða default_hs_url.",
     "Use %(brand)s on mobile": "Nota %(brand)s í síma",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s á %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s borðtölvuútgáfa: %(platformName)s"
 }

From bd26775dcb2c9012a09644d60ea7692d3e565c6c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Jan 2023 12:35:07 +0000
Subject: [PATCH 05/24] Update dependency ua-parser-js to v1.0.33 [SECURITY]
 (#24311)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3a20eee4426..474274aa434 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12192,9 +12192,9 @@ ua-parser-js@^0.7.30:
   integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
 
 ua-parser-js@^1.0.0, ua-parser-js@^1.0.2:
-  version "1.0.32"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.32.tgz#786bf17df97de159d5b1c9d5e8e9e89806f8a030"
-  integrity sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==
+  version "1.0.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.33.tgz#f21f01233e90e7ed0f059ceab46eb190ff17f8f4"
+  integrity sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From 1bb354e96d88ab8ebe6a5a538ff48d511004da9f Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 26 Jan 2023 15:43:02 +0000
Subject: [PATCH 06/24] Document the decoder ring (#24317)

* Document the decoder ring

Also a few little tidy-ups.

* Prettier
---
 CONTRIBUTING.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5ca195b9a65..fd3ef7d63bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,6 @@ ask you to make any refinements needed or merge it and make them ourselves.
 
 Things that should go into your PR description:
 
--   A changelog entry in the `Notes` section (see below)
 -   References to any bugs fixed by the change (in GitHub's `Fixes` notation)
 -   Describe the why and what is changing in the PR description so it's easy for
     onlookers and reviewers to onboard and context switch. This information is
@@ -41,11 +40,14 @@ Things that should go into your PR description:
 -   Add comments to the diff for the reviewer that might help them to understand
     why the change is necessary or how they might better understand and review it.
 
-We rely on information in pull request to populate the information that goes into
-the changelogs our users see, both for Element Web itself and other projects on
-which it is based. This is picked up from both labels on the pull request and
-the `Notes:` annotation in the description. By default, the PR title will be
-used for the changelog entry, but you can specify more options, as follows.
+### Changelogs
+
+There's no need to manually add Changelog entries: we use information in the
+pull request to populate the information that goes into the changelogs our
+users see, both for Element Web itself and other projects on which it is based.
+This is picked up from both labels on the pull request and the `Notes:`
+annotation in the description. By default, the PR title will be used for the
+changelog entry, but you can specify more options, as follows.
 
 To add a longer, more detailed description of the change for the changelog:
 
@@ -280,3 +282,10 @@ When stacking pull requests, you may wish to do the following:
 3. Merge the first PR using a merge commit otherwise your stacked PR will need a rebase. Github will automatically adjust the base branch of your other PR to be develop.
 
 [1]: /~https://github.com/gotwarlost/istanbul/blob/master/ignoring-code-for-coverage.md
+
+# Decoding Stack Traces
+
+Element Web has crashed and given you an obfuscated stack trace? Don't panic:
+use the [Decoder Ring](https://app.element.io/decoder-ring/) (or /decoder-ring/
+on any Element Web deploy). It is somewhat of a manual process, but it should
+tell you what lines the stack trace corresponds to from the source maps.

From 2ef14d322b8ad0077378f0c3af0cf00c35536685 Mon Sep 17 00:00:00 2001
From: theamazing0 <ksamvid@gmail.com>
Date: Sat, 28 Jan 2023 17:32:52 +0000
Subject: [PATCH 07/24] Translated using Weblate (English (United States))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/
---
 src/i18n/strings/en_US.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6926ff4b848..0bb2d786f07 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -24,5 +24,9 @@
     "Download Completed": "Download Completed",
     "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
-    "Your Element is misconfigured": "Your Element is misconfigured"
+    "Your Element is misconfigured": "Your Element is misconfigured",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo",
+    "Use %(brand)s on mobile": "Use %(brand)s on mobile",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s on %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }

From ee80d1b963a4e4ac5772f0b565184cecd84815ed Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Mon, 30 Jan 2023 14:35:56 +0100
Subject: [PATCH 08/24] Include Janne in WAT assignment automation

---
 .github/workflows/triage-assigned.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/triage-assigned.yml b/.github/workflows/triage-assigned.yml
index d0d25a29a9c..d2802c2eb9f 100644
--- a/.github/workflows/triage-assigned.yml
+++ b/.github/workflows/triage-assigned.yml
@@ -9,7 +9,8 @@ jobs:
         runs-on: ubuntu-latest
         if: |
             contains(github.event.issue.assignees.*.login, 't3chguy') ||
-            contains(github.event.issue.assignees.*.login, 'andybalaam')
+            contains(github.event.issue.assignees.*.login, 'andybalaam') ||
+            contains(github.event.issue.assignees.*.login, 'justjanne')
         steps:
             - uses: octokit/graphql-action@v2.x
               id: add_to_project

From 50f2b532e907dec1c46ae40b7555c6e59a2f11a6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 30 Jan 2023 14:08:15 +0000
Subject: [PATCH 09/24] Update build_develop.yml

---
 .github/workflows/build_develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index d998e4c284d..672070515c4 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -83,7 +83,7 @@ jobs:
             - name: Wait for other steps to succeed
               uses: lewagon/wait-on-check-action@v1.2.0
               with:
-                  ref: ${{ github.ref }}
+                  ref: ${{ github.sha }}
                   running-workflow-name: "Build & Deploy develop.element.io"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10

From 583ac3de963dab925cbe076ee51def322de2bfb1 Mon Sep 17 00:00:00 2001
From: maheichyk <mikhail.aheichyk@gmail.com>
Date: Tue, 31 Jan 2023 13:59:17 +0300
Subject: [PATCH 10/24] Jitsi requests 'requires_client' capability if auth
 token is provided (#24294)

* Jitsi requests 'io.element.requires_client' capability if auth token is provided

* Added a comment that Jitsi should request 'requires_client' capability to hide the popup icon in the Element if auth token is provided.

---------

Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
---
 src/vector/jitsi/index.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
index 95d3301113c..e06073f1d22 100644
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -28,6 +28,7 @@ import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/Elemen
 import { logger } from "matrix-js-sdk/src/logger";
 import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
+import { ElementWidgetCapabilities } from "matrix-react-sdk/src/stores/widgets/ElementWidgetCapabilities";
 
 import { getVectorConfig } from "../getconfig";
 
@@ -98,6 +99,13 @@ const setupCompleted = (async (): Promise<string | void> => {
 
             widgetApiReady = new Promise<void>((resolve) => widgetApi.once("ready", resolve));
             widgetApi.requestCapabilities(VideoConferenceCapabilities);
+
+            // jitsi cannot work in a popup if auth token is provided because widgetApi is not available there
+            // so check the token and request the 'requires_client' capability to hide the popup icon in the Element
+            if (qsParam("auth", true) === "openidtoken-jwt") {
+                widgetApi.requestCapability(ElementWidgetCapabilities.RequiresClient);
+            }
+
             widgetApi.start();
 
             const handleAction = (

From f8682899591ef0cc9381fe9f7b91c1f4d80ee7d8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Jan 2023 11:16:44 +0000
Subject: [PATCH 11/24] Reset matrix-js-sdk back to develop branch

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

diff --git a/package.json b/package.json
index 010de37b1d2..413c8a950c6 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.2.0",
+        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
         "matrix-react-sdk": "3.65.0",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 831c7991bfb..f266764e947 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8181,6 +8181,23 @@ matrix-js-sdk@23.2.0:
     unhomoglyph "^1.0.6"
     uuid "9"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "23.2.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c26dc02339c6b7c67b030b1701248a2d68c24c0"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"

From 4c19d2bd02372f3a1a0be4ac8ebc41795d270bbc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Jan 2023 11:16:59 +0000
Subject: [PATCH 12/24] Reset matrix-react-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 35 ++++++++---------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 413c8a950c6..9e7f542f686 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-react-sdk": "3.65.0",
+        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index f266764e947..faff684bdca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1569,10 +1569,10 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
   integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
 
-"@matrix-org/matrix-wysiwyg@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.20.0.tgz#6193f790b031eaa96e944b647fe2b27018639d57"
-  integrity sha512-9VqzyccwizglssShi/M+tCxdZDgzsecH4WjlS0HC5KkLmljIxxlHFstf/D3C/G4ZfRodFUh6wUvd+oQI/ScPpw==
+"@matrix-org/matrix-wysiwyg@^0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.22.0.tgz#53f1e80d9ae7be0940e0ca905a3952804b029b29"
+  integrity sha512-3b5jGMI56zcqZ2PktrSPMAbzfWmkdupuzcLeemWQ0fT8QuiG4dA72NUxdDyarlz+1eQ+Qm4fu9j/zsPlvNpy8g==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz":
   version "3.2.12"
@@ -8163,24 +8163,6 @@ 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@23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.2.0.tgz#3120ce7ce4278d41eed3b6aba6fd432ec3d19e29"
-  integrity sha512-BDQTx95FDBNxtoIpxDOMiy7Cb8FJTe673wDIzPoXtv45zYEjrEE3jpPMSgmGX5hOkE1R+YePmeiZlXRYLiHs1g==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "23.2.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c26dc02339c6b7c67b030b1701248a2d68c24c0"
@@ -8205,14 +8187,13 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.65.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.65.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.65.0.tgz#e111021184caad5c2d3398d7285269d1f62e1650"
-  integrity sha512-uQHPJ5FfuNmT6GLuL0S5bLYkfyT2ynZyKI9ctqpI0zLI5pF4CM1JG5w5flwm7xJKIww6nWTzlJwnx0zA7+by4w==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e2af97c4defeb990a06231658f97825780e0a717"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.4.0"
-    "@matrix-org/matrix-wysiwyg" "^0.20.0"
+    "@matrix-org/matrix-wysiwyg" "^0.22.0"
     "@matrix-org/react-sdk-module-api" "^0.0.3"
     "@sentry/browser" "^7.0.0"
     "@sentry/tracing" "^7.0.0"
@@ -8247,7 +8228,7 @@ matrix-react-sdk@3.65.0:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.2.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From a479f86952da9012099edcba4337c0bcc35e4d30 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Feb 2023 09:41:54 +0000
Subject: [PATCH 13/24] Update build_develop.yml

---
 .github/workflows/build_develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index 672070515c4..52d5c553c73 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -87,7 +87,7 @@ jobs:
                   running-workflow-name: "Build & Deploy develop.element.io"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issues|board).)*$
+                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label).)*$
 
             # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
             # as the expires after 24h and requires auth to download.

From e047e5d803c452f5d8a3e1eeb27fe635f21a147f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Wed, 1 Feb 2023 18:43:45 +0000
Subject: [PATCH 14/24] Description of QR code sign in labs feature (#23513)

---
 docs/labs.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/labs.md b/docs/labs.md
index 34eb4abe722..8a98056161b 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -185,3 +185,7 @@ have [MSC3827](/~https://github.com/matrix-org/matrix-spec-proposals/pull/3827) en
 ## Favourite Messages (`feature_favourite_messages`) [In Development]
 
 Enables users to bookmark a message or content for a later reference.
+
+## Sign in another device by showing a QR code (`feature_qr_signin_reciprocate_show`)
+
+Add capability to the session/device manager screens to generate a QR code to sign in another device + set up E2EE. This requires the homeserver to have support for [MSC3882](/~https://github.com/matrix-org/matrix-spec-proposals/pull/3882) and [MSC3886](/~https://github.com/matrix-org/matrix-spec-proposals/pull/3886) enabled.

From cfe4a779f2358a91b4a99ef4c6ad4144e3df80f3 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <d4bb0a95-96c1-4662-9d31-a5e520a01a09@hostux.ninja>
Date: Sat, 4 Feb 2023 08:54:43 +0000
Subject: [PATCH 15/24] Translated using Weblate (Japanese)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/
---
 src/i18n/strings/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index f544c8b1cd9..8e71f803cee 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -6,7 +6,7 @@
     "Invalid configuration: no default server specified.": "不正な設定：デフォルトのサーバーが設定されていません。",
     "Sign In": "サインイン",
     "Create Account": "アカウントを作成",
-    "Explore rooms": "ルームを探索",
+    "Explore rooms": "ルームを探す",
     "The message from the parser is: %(message)s": "パーサーのメッセージ：%(message)s",
     "Invalid JSON": "不正なJSON",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "不正な設定：default_server_config、default_server_name、またはdefault_hs_urlのいずれか一つのみを指定できます。",

From 27f1d999a043b0e4e304baa6897d1c7290a60bf5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Feb 2023 10:51:35 +0000
Subject: [PATCH 16/24] Update config.md - these UIFeature flags died with
 communities (#24428)

---
 docs/config.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index cc25d8ae56a..589879722cd 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -515,9 +515,6 @@ Currently, the following UI feature flags are supported:
 -   `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
     Jitsi widgets will still work though they cannot easily be added.
 -   `UIFeature.widgets` - Whether or not widgets will be shown.
--   `UIFeature.flair` - Whether or not community flair is shown in rooms.
--   `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
-    disables `UIFeature.flair` when disabled.
 -   `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
     user settings are shown to the user.
 -   `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog

From 6a29ebbcfb659c593fe40364855555258467ea09 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 7 Feb 2023 12:17:14 +0000
Subject: [PATCH 17/24] Upgrade matrix-js-sdk to 23.3.0-rc.1

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

diff --git a/package.json b/package.json
index cf1b17ec1e5..27b27f3a261 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "23.3.0-rc.1",
         "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index faff684bdca..57d765db565 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1569,6 +1569,11 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
   integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
 
+"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.3":
+  version "0.1.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.4.tgz#1b20294e0354c3dcc9c7dc810d883198a4042f04"
+  integrity sha512-mdaDKrw3P5ZVCpq0ioW0pV6ihviDEbS8ZH36kpt9stLKHwwDSopPogE6CkQhi0B1jn1yBUtOYi32mBV/zcOR7g==
+
 "@matrix-org/matrix-wysiwyg@^0.22.0":
   version "0.22.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.22.0.tgz#53f1e80d9ae7be0940e0ca905a3952804b029b29"
@@ -8163,6 +8168,24 @@ 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@23.3.0-rc.1:
+  version "23.3.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.3.0-rc.1.tgz#eb78f6b10864d5f6f8edb2738795e79e9aee9e02"
+  integrity sha512-EX7yW49Z8+u1+zb7CaDBx0i6eLBQuQZ0Owh51vOpf81G+j60sEPZ76uwsz2rLe3bD0BkCFjLPKN4Dm+RTKpUXQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "23.2.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c26dc02339c6b7c67b030b1701248a2d68c24c0"

From adf7085adf88c8b894f9b5319f7fa2d8cac98165 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 7 Feb 2023 12:17:45 +0000
Subject: [PATCH 18/24] Upgrade matrix-react-sdk to 3.66.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 47 ++++++++++++++++-------------------------------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 27b27f3a261..6181f766946 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.3.0-rc.1",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-react-sdk": "3.66.0-rc.1",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 57d765db565..c4ff4fdf6b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1564,20 +1564,15 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.4.0.tgz#ec75400ac41272cd2d47774da433437aba789bcf"
   integrity sha512-tLeak2pYiyxn431o7EdOJGwRjj2DApybOLZ0YtFMuhv87pBQhc3lz+IKCJ2c8NwV6e7kf4YNaTdXeygBvFPGFw==
 
-"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.2":
-  version "0.1.0-alpha.2"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
-  integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
-
 "@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.3":
   version "0.1.0-alpha.4"
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.4.tgz#1b20294e0354c3dcc9c7dc810d883198a4042f04"
   integrity sha512-mdaDKrw3P5ZVCpq0ioW0pV6ihviDEbS8ZH36kpt9stLKHwwDSopPogE6CkQhi0B1jn1yBUtOYi32mBV/zcOR7g==
 
-"@matrix-org/matrix-wysiwyg@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.22.0.tgz#53f1e80d9ae7be0940e0ca905a3952804b029b29"
-  integrity sha512-3b5jGMI56zcqZ2PktrSPMAbzfWmkdupuzcLeemWQ0fT8QuiG4dA72NUxdDyarlz+1eQ+Qm4fu9j/zsPlvNpy8g==
+"@matrix-org/matrix-wysiwyg@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.23.0.tgz#32242b18ae9dbb28d920c31f50bbac87ff4317fe"
+  integrity sha512-wO5KYznlfsSIMo0R8tyZqfvZrPkQMaL1qBHzhaeKIsC4vK4MnJ9mj6JiS6+XiuHJyc9nqN+IdeUjKyJOnStHaA==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz":
   version "3.2.12"
@@ -7918,6 +7913,11 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-react@4.0.0-beta.4:
+  version "4.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.0.0-beta.4.tgz#75311ade523a52d43054dd841d724d746d43f60d"
+  integrity sha512-o4vFe28vtk6i8a6tbtkLyusIyhLJSYoHC3gEpmJEVqi6Hy3aguVEenYmtaOjmAQehDrBYeHv9s4qcneZOf7SWQ==
+
 linkify-string@4.0.0-beta.4:
   version "4.0.0-beta.4"
   resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.0.0-beta.4.tgz#0982509bc6ce81c554bff8d7121057193b84ea32"
@@ -8186,23 +8186,6 @@ matrix-js-sdk@23.3.0-rc.1:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "23.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c26dc02339c6b7c67b030b1701248a2d68c24c0"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"
@@ -8210,13 +8193,14 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.65.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e2af97c4defeb990a06231658f97825780e0a717"
+matrix-react-sdk@3.66.0-rc.1:
+  version "3.66.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.66.0-rc.1.tgz#c0bc5748a7f0bec91afce227095bbab2d405a652"
+  integrity sha512-5d4xwx/5Xp2IYJItzMmeX6QrGMtS8WzvqABRAp83gP317dREfEyvbvUjJhvdy7cwyZJ+D5lVk6nW0oFr2XDRmw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.4.0"
-    "@matrix-org/matrix-wysiwyg" "^0.22.0"
+    "@matrix-org/matrix-wysiwyg" "^0.23.0"
     "@matrix-org/react-sdk-module-api" "^0.0.3"
     "@sentry/browser" "^7.0.0"
     "@sentry/tracing" "^7.0.0"
@@ -8245,13 +8229,14 @@ matrix-mock-request@^2.5.0:
     jszip "^3.7.0"
     katex "^0.16.0"
     linkify-element "4.0.0-beta.4"
+    linkify-react "4.0.0-beta.4"
     linkify-string "4.0.0-beta.4"
     linkifyjs "4.0.0-beta.4"
     lodash "^4.17.20"
     maplibre-gl "^2.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 "23.3.0-rc.1"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From e79d3352f8353f09d50a7440b101dcfcab0d9a33 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 7 Feb 2023 12:20:16 +0000
Subject: [PATCH 19/24] Prepare changelog for v1.11.23-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee8c6a67fc..78b29b6aed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,54 @@
+Changes in [1.11.23-rc.1](/~https://github.com/vector-im/element-web/releases/tag/v1.11.23-rc.1) (2023-02-07)
+===========================================================================================================
+
+## ✨ Features
+ * Description of QR code sign in labs feature ([\#23513](/~https://github.com/vector-im/element-web/pull/23513)). Contributed by @hughns.
+ * Indicate unread messages in tab title ([\#10096](/~https://github.com/matrix-org/matrix-react-sdk/pull/10096)). Contributed by @tnt7864.
+ * Open message in editing mode when keyboard up is pressed (RTE) ([\#10079](/~https://github.com/matrix-org/matrix-react-sdk/pull/10079)). Contributed by @florianduros.
+ * Hide superseded rooms from the room list using dynamic room predecessors ([\#10068](/~https://github.com/matrix-org/matrix-react-sdk/pull/10068)). Contributed by @andybalaam.
+ * Support MSC3946 in RoomListStore ([\#10054](/~https://github.com/matrix-org/matrix-react-sdk/pull/10054)). Fixes #24325. Contributed by @andybalaam.
+ * Auto focus security key field ([\#10048](/~https://github.com/matrix-org/matrix-react-sdk/pull/10048)).
+ * use Poll model with relations API in poll rendering ([\#9877](/~https://github.com/matrix-org/matrix-react-sdk/pull/9877)). Contributed by @kerryarchibald.
+ * Support MSC3946 in the RoomCreate tile ([\#10041](/~https://github.com/matrix-org/matrix-react-sdk/pull/10041)). Fixes #24323. Contributed by @andybalaam.
+ * Update labs flag description for RTE ([\#10058](/~https://github.com/matrix-org/matrix-react-sdk/pull/10058)). Contributed by @florianduros.
+ * Change ul list style to disc when editing message ([\#10043](/~https://github.com/matrix-org/matrix-react-sdk/pull/10043)). Contributed by @alunturner.
+ * Improved click detection within PiP windows ([\#10040](/~https://github.com/matrix-org/matrix-react-sdk/pull/10040)). Fixes #24371.
+ * Add RTE keyboard navigation in editing ([\#9980](/~https://github.com/matrix-org/matrix-react-sdk/pull/9980)). Fixes #23621. Contributed by @florianduros.
+ * Paragraph integration for rich text editor ([\#10008](/~https://github.com/matrix-org/matrix-react-sdk/pull/10008)). Contributed by @alunturner.
+ * Add  indentation increasing/decreasing to RTE ([\#10034](/~https://github.com/matrix-org/matrix-react-sdk/pull/10034)). Contributed by @florianduros.
+ * Add ignore user confirmation dialog ([\#6116](/~https://github.com/matrix-org/matrix-react-sdk/pull/6116)). Fixes #14746.
+ * Use monospace font for room, message IDs in View Source modal ([\#9956](/~https://github.com/matrix-org/matrix-react-sdk/pull/9956)). Fixes #21937. Contributed by @paragpoddar.
+ * Implement MSC3946 for AdvancedRoomSettingsTab ([\#9995](/~https://github.com/matrix-org/matrix-react-sdk/pull/9995)). Fixes #24322. Contributed by @andybalaam.
+ * Implementation of MSC3824 to make the client OIDC-aware ([\#8681](/~https://github.com/matrix-org/matrix-react-sdk/pull/8681)). Contributed by @hughns.
+ * Improves a11y for avatar uploads ([\#9985](/~https://github.com/matrix-org/matrix-react-sdk/pull/9985)). Contributed by @GoodGuyMarco.
+ * Add support for [token authenticated registration](https ([\#7275](/~https://github.com/matrix-org/matrix-react-sdk/pull/7275)). Fixes #18931. Contributed by @govynnus.
+
+## 🐛 Bug Fixes
+ * Jitsi requests 'requires_client' capability if auth token is provided ([\#24294](/~https://github.com/vector-im/element-web/pull/24294)). Contributed by @maheichyk.
+ * Fix a crash when removing persistent widgets (updated) ([\#10099](/~https://github.com/matrix-org/matrix-react-sdk/pull/10099)). Fixes #24412. Contributed by @andybalaam.
+ * Fix wrongly grouping 3pid invites into a single repeated transition ([\#10087](/~https://github.com/matrix-org/matrix-react-sdk/pull/10087)). Fixes #24432.
+ * Fix scrollbar colliding with checkbox in add to space section ([\#10093](/~https://github.com/matrix-org/matrix-react-sdk/pull/10093)). Fixes #23189. Contributed by @Arnabdaz.
+ * Add a whitespace character after 'broadcast?' ([\#10097](/~https://github.com/matrix-org/matrix-react-sdk/pull/10097)). Contributed by @luixxiul.
+ * Seekbar in broadcast PiP view is now updated when switching between different broadcasts ([\#10072](/~https://github.com/matrix-org/matrix-react-sdk/pull/10072)). Fixes #24415.
+ * Add border to "reject" button on room preview card for clickable area indication. It fixes vector-im/element-web#22623 ([\#9205](/~https://github.com/matrix-org/matrix-react-sdk/pull/9205)). Contributed by @gefgu.
+ * Element-R: fix rageshages ([\#10081](/~https://github.com/matrix-org/matrix-react-sdk/pull/10081)). Fixes #24430.
+ * Fix markdown paragraph display in timeline ([\#10071](/~https://github.com/matrix-org/matrix-react-sdk/pull/10071)). Fixes #24419. Contributed by @alunturner.
+ * Prevent the remaining broadcast time from being exceeded ([\#10070](/~https://github.com/matrix-org/matrix-react-sdk/pull/10070)).
+ * Fix cursor position when new line is created by pressing enter (RTE) ([\#10064](/~https://github.com/matrix-org/matrix-react-sdk/pull/10064)). Contributed by @florianduros.
+ * Ensure room is actually in space hierarchy when resolving its latest version ([\#10010](/~https://github.com/matrix-org/matrix-react-sdk/pull/10010)).
+ * Fix new line for inline code ([\#10062](/~https://github.com/matrix-org/matrix-react-sdk/pull/10062)). Contributed by @florianduros.
+ * Replace list, code block and quote icons by new icons ([\#10035](/~https://github.com/matrix-org/matrix-react-sdk/pull/10035)). Contributed by @florianduros.
+ * fix regional emojis converted to flags ([\#9294](/~https://github.com/matrix-org/matrix-react-sdk/pull/9294)). Fixes #19000. Contributed by @grimhilt.
+ * resolved emoji description text overflowing issue ([\#10028](/~https://github.com/matrix-org/matrix-react-sdk/pull/10028)). Contributed by @fahadNoufal.
+ * Fix MessageEditHistoryDialog crashing on complex input ([\#10018](/~https://github.com/matrix-org/matrix-react-sdk/pull/10018)). Fixes #23665. Contributed by @clarkf.
+ * Unify unread notification state determination ([\#9941](/~https://github.com/matrix-org/matrix-react-sdk/pull/9941)). Contributed by @clarkf.
+ * Fix useUnreadNotifications exploding with falsey room, like in notif panel ([\#10030](/~https://github.com/matrix-org/matrix-react-sdk/pull/10030)). Fixes matrix-org/element-web-rageshakes#19334.
+ * Fix "[object Promise]" appearing in HTML exports ([\#9975](/~https://github.com/matrix-org/matrix-react-sdk/pull/9975)). Fixes #24272. Contributed by @clarkf.
+ * Should open new 1:1 chat room after leaving the old one ([\#9880](/~https://github.com/matrix-org/matrix-react-sdk/pull/9880)). Contributed by @ahmadkadri.
+ * changing the color of message time stamp ([\#10016](/~https://github.com/matrix-org/matrix-react-sdk/pull/10016)). Contributed by @nawarajshah.
+ * Fix link creation with backward selection ([\#9986](/~https://github.com/matrix-org/matrix-react-sdk/pull/9986)). Fixes #24315. Contributed by @florianduros.
+ * Misaligned reply preview in thread composer #23396 ([\#9977](/~https://github.com/matrix-org/matrix-react-sdk/pull/9977)). Fixes #23396. Contributed by @mustafa-kapadia1483.
+
 Changes in [1.11.22](/~https://github.com/vector-im/element-web/releases/tag/v1.11.22) (2023-01-31)
 =================================================================================================
 

From b6ad059c60ba1191ba1e54e68c7da7a1b9699136 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 7 Feb 2023 12:20:17 +0000
Subject: [PATCH 20/24] v1.11.23-rc.1

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

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

From 1e1fd225e19f7fe391a4726c980deb4044666854 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Feb 2023 10:36:04 +0000
Subject: [PATCH 21/24] Upgrade matrix-js-sdk to 23.3.0

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

diff --git a/package.json b/package.json
index eedf4740a3f..cc4392ad881 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.3.0-rc.1",
+        "matrix-js-sdk": "23.3.0",
         "matrix-react-sdk": "3.66.0-rc.1",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index c4ff4fdf6b6..e777dd727a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8168,6 +8168,24 @@ 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@23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.3.0.tgz#d0c4a6c022039df2b76d8a062d695d2991296ded"
+  integrity sha512-5wCYxbWeOBbfegqNJGCbzbZnjiUjZQ3N/d+/S2e+utjI7+m/2TH27seZRdrOzlIOf0DAqhTxdtGkmcmW/6/+LQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 matrix-js-sdk@23.3.0-rc.1:
   version "23.3.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.3.0-rc.1.tgz#eb78f6b10864d5f6f8edb2738795e79e9aee9e02"

From 6a9547797d8bd56ceff124e4bc7dbcb50ba41811 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Feb 2023 10:36:24 +0000
Subject: [PATCH 22/24] Upgrade matrix-react-sdk to 3.66.0

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

diff --git a/package.json b/package.json
index cc4392ad881..db8440fab95 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.3.0",
-        "matrix-react-sdk": "3.66.0-rc.1",
+        "matrix-react-sdk": "3.66.0",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index e777dd727a0..3c14f18765c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8186,24 +8186,6 @@ matrix-js-sdk@23.3.0:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-matrix-js-sdk@23.3.0-rc.1:
-  version "23.3.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.3.0-rc.1.tgz#eb78f6b10864d5f6f8edb2738795e79e9aee9e02"
-  integrity sha512-EX7yW49Z8+u1+zb7CaDBx0i6eLBQuQZ0Owh51vOpf81G+j60sEPZ76uwsz2rLe3bD0BkCFjLPKN4Dm+RTKpUXQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"
@@ -8211,10 +8193,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.66.0-rc.1:
-  version "3.66.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.66.0-rc.1.tgz#c0bc5748a7f0bec91afce227095bbab2d405a652"
-  integrity sha512-5d4xwx/5Xp2IYJItzMmeX6QrGMtS8WzvqABRAp83gP317dREfEyvbvUjJhvdy7cwyZJ+D5lVk6nW0oFr2XDRmw==
+matrix-react-sdk@3.66.0:
+  version "3.66.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.66.0.tgz#a7f96657cf9f3428a79867f1d52fca4f1b57c8fc"
+  integrity sha512-42wnl5QyeGLfC8zJGZbApAFprR9VXOUGyxGBqIna+ICvrtSYlXKH2ji6nYrqRKLjKq79jrExsPT0yQLUYrr9+A==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.4.0"
@@ -8254,7 +8236,7 @@ matrix-react-sdk@3.66.0-rc.1:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.3.0-rc.1"
+    matrix-js-sdk "23.3.0"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 40475f864d6b34cd93f0626a0322a1ab4dc1cb02 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Feb 2023 10:38:57 +0000
Subject: [PATCH 23/24] Prepare changelog for v1.11.23

---
 CHANGELOG.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78b29b6aed5..270227a7326 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-Changes in [1.11.23-rc.1](/~https://github.com/vector-im/element-web/releases/tag/v1.11.23-rc.1) (2023-02-07)
-===========================================================================================================
+Changes in [1.11.23](/~https://github.com/vector-im/element-web/releases/tag/v1.11.23) (2023-02-14)
+=================================================================================================
 
 ## ✨ Features
  * Description of QR code sign in labs feature ([\#23513](/~https://github.com/vector-im/element-web/pull/23513)). Contributed by @hughns.
+ * Add option to find own location in map views ([\#10083](/~https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
+ * Render poll end events in timeline ([\#10027](/~https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
  * Indicate unread messages in tab title ([\#10096](/~https://github.com/matrix-org/matrix-react-sdk/pull/10096)). Contributed by @tnt7864.
  * Open message in editing mode when keyboard up is pressed (RTE) ([\#10079](/~https://github.com/matrix-org/matrix-react-sdk/pull/10079)). Contributed by @florianduros.
  * Hide superseded rooms from the room list using dynamic room predecessors ([\#10068](/~https://github.com/matrix-org/matrix-react-sdk/pull/10068)). Contributed by @andybalaam.
@@ -25,6 +27,14 @@ Changes in [1.11.23-rc.1](/~https://github.com/vector-im/element-web/releases/tag/
 
 ## 🐛 Bug Fixes
  * Jitsi requests 'requires_client' capability if auth token is provided ([\#24294](/~https://github.com/vector-im/element-web/pull/24294)). Contributed by @maheichyk.
+ * Remove duplicate white space characters from translation keys ([\#10152](/~https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
+ * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](/~https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
+ * Prevent start another DM with a user if one already exists ([\#10127](/~https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes #23138.
+ * Remove white space characters before the horizontal ellipsis ([\#10130](/~https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
+ * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](/~https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes #23232. Contributed by @akshattchhabra.
+ * Correctly Identify emoticons ([\#10108](/~https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes #19472. Contributed by @adarsh-sgh.
+ * Should open new 1:1 chat room after leaving the old one ([\#9880](/~https://github.com/matrix-org/matrix-react-sdk/pull/9880)). Contributed by @ahmadkadri.
+ * Remove a redundant white space ([\#10129](/~https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
  * Fix a crash when removing persistent widgets (updated) ([\#10099](/~https://github.com/matrix-org/matrix-react-sdk/pull/10099)). Fixes #24412. Contributed by @andybalaam.
  * Fix wrongly grouping 3pid invites into a single repeated transition ([\#10087](/~https://github.com/matrix-org/matrix-react-sdk/pull/10087)). Fixes #24432.
  * Fix scrollbar colliding with checkbox in add to space section ([\#10093](/~https://github.com/matrix-org/matrix-react-sdk/pull/10093)). Fixes #23189. Contributed by @Arnabdaz.
@@ -37,14 +47,16 @@ Changes in [1.11.23-rc.1](/~https://github.com/vector-im/element-web/releases/tag/
  * Fix cursor position when new line is created by pressing enter (RTE) ([\#10064](/~https://github.com/matrix-org/matrix-react-sdk/pull/10064)). Contributed by @florianduros.
  * Ensure room is actually in space hierarchy when resolving its latest version ([\#10010](/~https://github.com/matrix-org/matrix-react-sdk/pull/10010)).
  * Fix new line for inline code ([\#10062](/~https://github.com/matrix-org/matrix-react-sdk/pull/10062)). Contributed by @florianduros.
+ * Member avatars without canvas ([\#9990](/~https://github.com/matrix-org/matrix-react-sdk/pull/9990)). Contributed by @clarkf.
+ * Apply more general fix for base avatar regressions ([\#10045](/~https://github.com/matrix-org/matrix-react-sdk/pull/10045)). Fixes #24382 and #24370.
  * Replace list, code block and quote icons by new icons ([\#10035](/~https://github.com/matrix-org/matrix-react-sdk/pull/10035)). Contributed by @florianduros.
  * fix regional emojis converted to flags ([\#9294](/~https://github.com/matrix-org/matrix-react-sdk/pull/9294)). Fixes #19000. Contributed by @grimhilt.
  * resolved emoji description text overflowing issue ([\#10028](/~https://github.com/matrix-org/matrix-react-sdk/pull/10028)). Contributed by @fahadNoufal.
  * Fix MessageEditHistoryDialog crashing on complex input ([\#10018](/~https://github.com/matrix-org/matrix-react-sdk/pull/10018)). Fixes #23665. Contributed by @clarkf.
  * Unify unread notification state determination ([\#9941](/~https://github.com/matrix-org/matrix-react-sdk/pull/9941)). Contributed by @clarkf.
+ * Fix layout and visual regressions around default avatars ([\#10031](/~https://github.com/matrix-org/matrix-react-sdk/pull/10031)). Fixes #24375 and #24369.
  * Fix useUnreadNotifications exploding with falsey room, like in notif panel ([\#10030](/~https://github.com/matrix-org/matrix-react-sdk/pull/10030)). Fixes matrix-org/element-web-rageshakes#19334.
  * Fix "[object Promise]" appearing in HTML exports ([\#9975](/~https://github.com/matrix-org/matrix-react-sdk/pull/9975)). Fixes #24272. Contributed by @clarkf.
- * Should open new 1:1 chat room after leaving the old one ([\#9880](/~https://github.com/matrix-org/matrix-react-sdk/pull/9880)). Contributed by @ahmadkadri.
  * changing the color of message time stamp ([\#10016](/~https://github.com/matrix-org/matrix-react-sdk/pull/10016)). Contributed by @nawarajshah.
  * Fix link creation with backward selection ([\#9986](/~https://github.com/matrix-org/matrix-react-sdk/pull/9986)). Fixes #24315. Contributed by @florianduros.
  * Misaligned reply preview in thread composer #23396 ([\#9977](/~https://github.com/matrix-org/matrix-react-sdk/pull/9977)). Fixes #23396. Contributed by @mustafa-kapadia1483.

From 0909eb46cae199b821dcba1cc40efe8b4a937741 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Feb 2023 10:38:58 +0000
Subject: [PATCH 24/24] v1.11.23

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

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