From 1af4f7568827856eb2d314dcb27f68b0e11acd61 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 Aug 2022 10:33:23 +0100
Subject: [PATCH 01/13] Create dockerhub.yaml

---
 .github/workflows/dockerhub.yaml | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/workflows/dockerhub.yaml

diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
new file mode 100644
index 0000000000..0f0dd4f476
--- /dev/null
+++ b/.github/workflows/dockerhub.yaml
@@ -0,0 +1,59 @@
+name: Dockerhub
+on:
+  workflow_dispatch: { }
+  push:
+    tags: [ v* ]
+  schedule:
+    # This job can take a while, and we have usage limits, so just publish develop only twice a day
+    - cron: '0 7/12 * * *'
+concurrency: ${{ github.ref_name }}
+jobs:
+  buildx:
+    name: Docker Buildx
+    runs-on: ubuntu-latest
+    environment: dockerhub
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # needed for docker-package to be able to calculate the version
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            vectorim/element-web
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Update repo description
+        uses: peter-evans/dockerhub-description@v2
+        continue-on-error: true
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: vectorim/element-web

From b17149ab3916f417101935d27461481a0359bccf Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 Aug 2022 17:21:10 +0100
Subject: [PATCH 02/13] Upgrade matrix-js-sdk to 19.3.0-rc.1

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

diff --git a/package.json b/package.json
index 056e70ed8b..edb73534df 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "19.3.0-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index bd2719e41d..1ad2a166b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8111,6 +8111,23 @@ matrix-events-sdk@^0.0.1-beta.7:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 
+matrix-js-sdk@19.3.0-rc.1:
+  version "19.3.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.1.tgz#dda9f140dca076a77c5c00315b53bf2d417e5946"
+  integrity sha512-sK5bdn0AClJD+Cgned/rHcqMNRy1HEDuU/4SiRFoO+ROhBnNTsN3L7nOosS318WTCCpTwu2OdJCcMSJ9BBridw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "^0.0.1-beta.7"
+    p-retry "4"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "19.2.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cf33569a2187628dd7954ac771995cce3e804af4"

From adf4a7fb2174e57f8a59abc965ea1f8a647e206d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 Aug 2022 17:24:24 +0100
Subject: [PATCH 03/13] Upgrade matrix-react-sdk to 3.52.0-rc.1

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

diff --git a/package.json b/package.json
index edb73534df..1b91e20033 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
     "matrix-js-sdk": "19.3.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.52.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 1ad2a166b3..3602e7b52d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8128,22 +8128,6 @@ matrix-js-sdk@19.3.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "19.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cf33569a2187628dd7954ac771995cce3e804af4"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "^0.0.1-beta.7"
-    p-retry "4"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.0.tgz#86f5b0ef846865d0767d3a8e64f5bcd6ca94c178"
@@ -8151,9 +8135,10 @@ matrix-mock-request@^2.0.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.51.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/ed3350c2ba37863fbb5c82dcc85885feaaa03ef8"
+matrix-react-sdk@3.52.0-rc.1:
+  version "3.52.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.52.0-rc.1.tgz#73b5333254d8cfd57e70c27c1d666f4f0dd6c7f3"
+  integrity sha512-7JHMMe5r/nm9Asyf/PgW+LS50ldkzui38MrR7NztDBkuNDk11O7Q9d3IvzvWlkcuhr/BCbAV80funKYfSvUG7Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.2.0"
@@ -8193,7 +8178,7 @@ matrix-mock-request@^2.0.0:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "^0.0.1-beta.7"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "19.3.0-rc.1"
     matrix-widget-api "^0.1.0-beta.18"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 8cd3294192653f949dd50d92ec032b6f0583fb6d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 Aug 2022 17:27:06 +0100
Subject: [PATCH 04/13] Prepare changelog for v1.11.3-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a82a36115b..64ae51e085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+Changes in [1.11.3-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.3-rc.1) (2022-08-09)
+=========================================================================================================
+
+## ✨ Features
+ * Improve auth aria attributes and semantics ([\#22948](https://github.com/vector-im/element-web/pull/22948)).
+ * Device manager - New device tile info design ([\#9122](https://github.com/matrix-org/matrix-react-sdk/pull/9122)). Contributed by @kerryarchibald.
+ * Device manager generic settings subsection component ([\#9147](https://github.com/matrix-org/matrix-react-sdk/pull/9147)). Contributed by @kerryarchibald.
+ * Migrate the hidden read receipts flag to new "send read receipts" option ([\#9141](https://github.com/matrix-org/matrix-react-sdk/pull/9141)).
+ * Live location sharing - share location at most every 5 seconds ([\#9148](https://github.com/matrix-org/matrix-react-sdk/pull/9148)). Contributed by @kerryarchibald.
+ * Increase max length of voice messages to 15m ([\#9133](https://github.com/matrix-org/matrix-react-sdk/pull/9133)). Fixes #18620.
+ * Move pin drop out of labs ([\#9135](https://github.com/matrix-org/matrix-react-sdk/pull/9135)).
+ * Start DM on first message ([\#8612](https://github.com/matrix-org/matrix-react-sdk/pull/8612)). Fixes #14736.
+ * Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\#9129](https://github.com/matrix-org/matrix-react-sdk/pull/9129)).
+ * The Welcome Home Screen: Dedicated Download Apps Dialog ([\#9120](https://github.com/matrix-org/matrix-react-sdk/pull/9120)). Fixes #22921. Contributed by @justjanne.
+ * The Welcome Home Screen: "Submit Feedback" pane ([\#9090](https://github.com/matrix-org/matrix-react-sdk/pull/9090)). Fixes #22918. Contributed by @justjanne.
+ * New User Onboarding Task List ([\#9083](https://github.com/matrix-org/matrix-react-sdk/pull/9083)). Fixes #22919. Contributed by @justjanne.
+ * Add support for disabling spell checking ([\#8604](https://github.com/matrix-org/matrix-react-sdk/pull/8604)). Fixes #21901.
+ * Live location share - leave maximised map open when beacons expire ([\#9098](https://github.com/matrix-org/matrix-react-sdk/pull/9098)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Use stable reference for active tab in tabbedView ([\#9145](https://github.com/matrix-org/matrix-react-sdk/pull/9145)). Contributed by @kerryarchibald.
+ * Fix pillification sometimes doubling up ([\#9152](https://github.com/matrix-org/matrix-react-sdk/pull/9152)). Fixes #23036.
+ * Fix highlights not being applied to plaintext messages ([\#9126](https://github.com/matrix-org/matrix-react-sdk/pull/9126)). Fixes #22787.
+ * Fix dismissing edit composer when change was undone ([\#9109](https://github.com/matrix-org/matrix-react-sdk/pull/9109)). Fixes #22932.
+ * 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\#9124](https://github.com/matrix-org/matrix-react-sdk/pull/9124)). Fixes #22894.
+ * Apply inline start padding to selected lines on modern layout only ([\#9006](https://github.com/matrix-org/matrix-react-sdk/pull/9006)). Fixes #22768. Contributed by @luixxiul.
+ * Peek into world-readable rooms from spotlight ([\#9115](https://github.com/matrix-org/matrix-react-sdk/pull/9115)). Fixes #22862.
+ * Use default styling on nested numbered lists due to MD being sensitive ([\#9110](https://github.com/matrix-org/matrix-react-sdk/pull/9110)). Fixes #22935.
+ * Fix replying using chat effect commands ([\#9101](https://github.com/matrix-org/matrix-react-sdk/pull/9101)). Fixes #22824.
+
 Changes in [1.11.2](https://github.com/vector-im/element-web/releases/tag/v1.11.2) (2022-08-03)
 ===============================================================================================
 

From f15f5a59de11b806ef78071c8d8dcdc1d5652ea4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 Aug 2022 17:27:06 +0100
Subject: [PATCH 05/13] v1.11.3-rc.1

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

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

From ee0d29f4e7a0f50e4b0e6e33a7a1f93913b4a809 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 12 Aug 2022 13:53:01 +0100
Subject: [PATCH 06/13] Upgrade matrix-js-sdk to 19.3.0-rc.2

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

diff --git a/package.json b/package.json
index 5394a71273..52d5ca28b7 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "19.3.0-rc.1",
+    "matrix-js-sdk": "19.3.0-rc.2",
     "matrix-react-sdk": "3.52.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 3602e7b52d..de9ddaaf21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8128,6 +8128,23 @@ matrix-js-sdk@19.3.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
+matrix-js-sdk@19.3.0-rc.2:
+  version "19.3.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.2.tgz#ede132ee6f0b97b1444bbd515c12b27678b49da0"
+  integrity sha512-UixvWZ+rfBiDw3jf35XHYkEXHSQ6wHPM9fs58HAe3124PU3JeEeQl2f+0OKJzd0jnXah3WWPAylpvmpNeNGjXg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "^0.0.1-beta.7"
+    p-retry "4"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-mock-request@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.0.tgz#86f5b0ef846865d0767d3a8e64f5bcd6ca94c178"

From cad20f3e0ff1a3cab83fec066b0aa4474750ee0a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 12 Aug 2022 14:07:26 +0100
Subject: [PATCH 07/13] Upgrade matrix-react-sdk to 3.52.0-rc.2

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

diff --git a/package.json b/package.json
index 52d5ca28b7..130c96a173 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
     "matrix-js-sdk": "19.3.0-rc.2",
-    "matrix-react-sdk": "3.52.0-rc.1",
+    "matrix-react-sdk": "3.52.0-rc.2",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index de9ddaaf21..250b8a1e10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8111,23 +8111,6 @@ matrix-events-sdk@^0.0.1-beta.7:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 
-matrix-js-sdk@19.3.0-rc.1:
-  version "19.3.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.1.tgz#dda9f140dca076a77c5c00315b53bf2d417e5946"
-  integrity sha512-sK5bdn0AClJD+Cgned/rHcqMNRy1HEDuU/4SiRFoO+ROhBnNTsN3L7nOosS318WTCCpTwu2OdJCcMSJ9BBridw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "^0.0.1-beta.7"
-    p-retry "4"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-js-sdk@19.3.0-rc.2:
   version "19.3.0-rc.2"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.2.tgz#ede132ee6f0b97b1444bbd515c12b27678b49da0"
@@ -8152,10 +8135,10 @@ matrix-mock-request@^2.0.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.52.0-rc.1:
-  version "3.52.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.52.0-rc.1.tgz#73b5333254d8cfd57e70c27c1d666f4f0dd6c7f3"
-  integrity sha512-7JHMMe5r/nm9Asyf/PgW+LS50ldkzui38MrR7NztDBkuNDk11O7Q9d3IvzvWlkcuhr/BCbAV80funKYfSvUG7Q==
+matrix-react-sdk@3.52.0-rc.2:
+  version "3.52.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.52.0-rc.2.tgz#2ee58ccc365863a5116935b4c7fe84e89d5bf8e0"
+  integrity sha512-6VZo+zlc1zgfc3Kp0qnQKh+vumQFgCPe2qEBAezRZS2ODS3brronfz1LSxS5togs60tQ//71lT0U9ra25f3chQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.2.0"
@@ -8195,7 +8178,7 @@ matrix-react-sdk@3.52.0-rc.1:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "^0.0.1-beta.7"
-    matrix-js-sdk "19.3.0-rc.1"
+    matrix-js-sdk "19.3.0-rc.2"
     matrix-widget-api "^0.1.0-beta.18"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 73189872b356b4473b59a53a9ac8fa4da7553952 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 12 Aug 2022 14:13:46 +0100
Subject: [PATCH 08/13] Prepare changelog for v1.11.3-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64ae51e085..29b7ef45e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.3-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.3-rc.2) (2022-08-12)
+=========================================================================================================
+
+##   Features
+ * The first message in a DM can no longer be a sticker. This has been changed to avoid issues with the integration manager. ([\#9180](https://github.com/matrix-org/matrix-react-sdk/pull/9180)).
+
 Changes in [1.11.3-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.3-rc.1) (2022-08-09)
 =========================================================================================================
 

From d7f2eba31074b0590f608cb7beb73a929a703e7d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 12 Aug 2022 14:13:47 +0100
Subject: [PATCH 09/13] v1.11.3-rc.2

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

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

From fd3289f67e5435510bbeb6ccbce5032a8c788184 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Aug 2022 15:49:17 +0100
Subject: [PATCH 10/13] Upgrade matrix-js-sdk to 19.3.0

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

diff --git a/package.json b/package.json
index 8ab55079bd..aaffd99f87 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "19.3.0-rc.2",
+    "matrix-js-sdk": "19.3.0",
     "matrix-react-sdk": "3.52.0-rc.2",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 250b8a1e10..41a51e4049 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8111,6 +8111,23 @@ matrix-events-sdk@^0.0.1-beta.7:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 
+matrix-js-sdk@19.3.0:
+  version "19.3.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0.tgz#1a9ea66201ae349eb95039b3a63780c7d6607313"
+  integrity sha512-ZhYfDdnqujEFeZe+ek5SdxUgWXQBq2OaOgWnQwG4jD00ANdTmeBKlDsNCjOwefyD6UQ1G/oM2W/YVEghihAT1g==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "^0.0.1-beta.7"
+    p-retry "4"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@19.3.0-rc.2:
   version "19.3.0-rc.2"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.2.tgz#ede132ee6f0b97b1444bbd515c12b27678b49da0"

From 538b1a22945cb6f127601fbe4fe77be5e056e7af Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Aug 2022 15:57:27 +0100
Subject: [PATCH 11/13] Upgrade matrix-react-sdk to 3.52.0

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

diff --git a/package.json b/package.json
index aaffd99f87..c00edf36c8 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.12.0",
     "matrix-js-sdk": "19.3.0",
-    "matrix-react-sdk": "3.52.0-rc.2",
+    "matrix-react-sdk": "3.52.0",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 41a51e4049..565362bb24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8128,23 +8128,6 @@ matrix-js-sdk@19.3.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@19.3.0-rc.2:
-  version "19.3.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0-rc.2.tgz#ede132ee6f0b97b1444bbd515c12b27678b49da0"
-  integrity sha512-UixvWZ+rfBiDw3jf35XHYkEXHSQ6wHPM9fs58HAe3124PU3JeEeQl2f+0OKJzd0jnXah3WWPAylpvmpNeNGjXg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "^0.0.1-beta.7"
-    p-retry "4"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.0.tgz#86f5b0ef846865d0767d3a8e64f5bcd6ca94c178"
@@ -8152,10 +8135,10 @@ matrix-mock-request@^2.0.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.52.0-rc.2:
-  version "3.52.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.52.0-rc.2.tgz#2ee58ccc365863a5116935b4c7fe84e89d5bf8e0"
-  integrity sha512-6VZo+zlc1zgfc3Kp0qnQKh+vumQFgCPe2qEBAezRZS2ODS3brronfz1LSxS5togs60tQ//71lT0U9ra25f3chQ==
+matrix-react-sdk@3.52.0:
+  version "3.52.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.52.0.tgz#591d2407ddeb47d84ff3cc48470552c148c22268"
+  integrity sha512-3bd2koHYDTWVRIFFQ9qACYweypYMIU3opWBdwQN2V3naAyspqw370747bahknAi7od6cq7jSlmyQhkD8YWQ3Fg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.2.0"
@@ -8195,7 +8178,7 @@ matrix-react-sdk@3.52.0-rc.2:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "^0.0.1-beta.7"
-    matrix-js-sdk "19.3.0-rc.2"
+    matrix-js-sdk "19.3.0"
     matrix-widget-api "^0.1.0-beta.18"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From f698ce7e798ae46e7dd7a65470b459e7b0c16c24 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Aug 2022 16:07:39 +0100
Subject: [PATCH 12/13] Prepare changelog for v1.11.3

---
 CHANGELOG.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29b7ef45e1..178ddaa089 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
-Changes in [1.11.3-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.3-rc.2) (2022-08-12)
-=========================================================================================================
-
-##   Features
- * The first message in a DM can no longer be a sticker. This has been changed to avoid issues with the integration manager. ([\#9180](https://github.com/matrix-org/matrix-react-sdk/pull/9180)).
-
-Changes in [1.11.3-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.3-rc.1) (2022-08-09)
-=========================================================================================================
+Changes in [1.11.3](https://github.com/vector-im/element-web/releases/tag/v1.11.3) (2022-08-16)
+===============================================================================================
 
 ## ✨ Features
  * Improve auth aria attributes and semantics ([\#22948](https://github.com/vector-im/element-web/pull/22948)).
@@ -24,6 +18,7 @@ Changes in [1.11.3-rc.1](https://github.com/vector-im/element-web/releases/tag/v
  * Live location share - leave maximised map open when beacons expire ([\#9098](https://github.com/matrix-org/matrix-react-sdk/pull/9098)). Contributed by @kerryarchibald.
 
 ## 🐛 Bug Fixes
+ * Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\#9193](https://github.com/matrix-org/matrix-react-sdk/pull/9193)).
  * Use stable reference for active tab in tabbedView ([\#9145](https://github.com/matrix-org/matrix-react-sdk/pull/9145)). Contributed by @kerryarchibald.
  * Fix pillification sometimes doubling up ([\#9152](https://github.com/matrix-org/matrix-react-sdk/pull/9152)). Fixes #23036.
  * Fix highlights not being applied to plaintext messages ([\#9126](https://github.com/matrix-org/matrix-react-sdk/pull/9126)). Fixes #22787.

From 33caca80e289217191d045670fc6d167d40c6214 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Aug 2022 16:07:40 +0100
Subject: [PATCH 13/13] v1.11.3

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

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