Upstream v1.11.104

element-desktop

@@ -1 +1 @@
-Subproject commit 0c751e1a25b3d7ca21830f076161c94887c887a9
+Subproject commit 4815d02ac15dc8e8371a5b0b3deac7879c463373

element-web

@@ -1 +1 @@
-Subproject commit 2c3bfff90d36697892ea7e32404751a896e26cc1
+Subproject commit 3742a6cef8258430c592afc42bedc9d776a67527

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 40bc833bb79a7cfda376d7a7e94e9d6cab6169a7
+Subproject commit 28bc90563e86cd087c7cebe4ccd04c3c47842337

patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch

@@ -1,4 +1,4 @@
-From 73f20d371b005b2ceba60c84e040bf246dfb740d Mon Sep 17 00:00:00 2001
+From cadd0ad4af331ffe0d1fa53b604ef86449a20415 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 2 Dec 2023 12:57:26 +0100
 Subject: Add back schildi fetch-package.ts modifications

patches/element-web/0002-Change-default-login-background.patch

@@ -1,4 +1,4 @@
-From 48bbd49a2be1a527b9521b9f026b0f33a08e1dae Mon Sep 17 00:00:00 2001
+From 1028d2669b77bcd03372f8d518f1907613532a2c Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 29 Nov 2020 23:30:59 +0100
 Subject: Change default login background

patches/element-web/0003-Don-t-welcome-to-Element.patch

@@ -1,4 +1,4 @@
-From 6c056866602edd92ccf8237c1fcce3cbaf1303f4 Mon Sep 17 00:00:00 2001
+From a3b7f14f8ffda860d95cbcff2a32e2208536577f Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:38:47 +0100
 Subject: Don't welcome to Element

patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch

@@ -1,4 +1,4 @@
-From 14f922a37ab1879de4834e0e3734f83ec453f679 Mon Sep 17 00:00:00 2001
+From 8970c2529da9f474e838204ca2a8145b0fe35317 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:55:30 +0100
 Subject: Stronger login background to ensure contrast of our icon with our bg

patches/element-web/0005-Schildify-login-footer.patch

@@ -1,4 +1,4 @@
-From 9474a8c7f96f94c4a19380251121beb3c5a3c925 Mon Sep 17 00:00:00 2001
+From 0ed74da29cf1fe5e754b2652a198a5e9a46e5cbf Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 20:07:30 +0100
 Subject: Schildify login footer

patches/element-web/0006-Disable-sticky-rooms.patch

@@ -1,4 +1,4 @@
-From c2efb5cd9f33a87ef2a900272d7845883fc62f6a Mon Sep 17 00:00:00 2001
+From 75a7434cf02dddb10a943f64a0bd66f25c4f89de Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 18 Jan 2022 13:28:22 +0100
 Subject: Disable sticky rooms

patches/element-web/0007-Bring-back-unified-room-list.patch

@@ -1,4 +1,4 @@
-From a05aa4750cc2c3e44ec9f9a9e17271b3d6d91f36 Mon Sep 17 00:00:00 2001
+From 71b9a77c5ef501b8c2993542fe0db9051452b889 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 5 May 2024 10:12:17 +0200
 Subject: Bring back unified room list
@@ -128,10 +128,10 @@ index 6be226a172..dbb69d8f62 100644
                  (this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) ||
                  (this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 36030713ec..ac88f717d4 100644
+index 3ca7503cd1..07f0e8ac5b 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -359,6 +359,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
+@@ -363,6 +363,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
  export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
  
  export const SETTINGS: Settings = {

patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch

@@ -1,4 +1,4 @@
-From 20700378880fc7dff567ed68fd04c83daaa3daa9 Mon Sep 17 00:00:00 2001
+From 74dda33af1f2ac88589ca136be1d76de544e7b9b Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 17 Dec 2023 11:11:58 +0100
 Subject: Don't sort muted rooms to bottom, I still want to see them.

patches/element-web/0009-Don-t-preview-reactions.patch

@@ -1,4 +1,4 @@
-From 2ced3032f04e97b57b3b21ff0bde91f95e4a3590 Mon Sep 17 00:00:00 2001
+From f778dbe376a0305e03d811edff99e3e3a9203ae8 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 14 Dec 2023 10:32:10 +0100
 Subject: Don't preview reactions

patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch

@@ -1,4 +1,4 @@
-From 46eb0329f9c66937545a6d55cf025ccb4b3803f5 Mon Sep 17 00:00:00 2001
+From f951c326f3a30edff1eea255a32ef840db347505 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 17 Nov 2021 12:50:25 +0100
 Subject: Hide the "mute" notification state the same way as the other states

patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch

@@ -1,4 +1,4 @@
-From 71b7b79b37c7caef3d560057c9abc571da7066bb Mon Sep 17 00:00:00 2001
+From b196b6d8b102eb48a23205dcc5a89256ba0569d1 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Fri, 10 May 2024 18:58:32 +0200
 Subject: Allow muted rooms to render as unread

patches/element-web/0012-Increase-default-visible-tiles.patch

@@ -1,4 +1,4 @@
-From 53fb54d47a30cb553776efd5c687f1f3dc4f1423 Mon Sep 17 00:00:00 2001
+From b24179372bb18ac0eec1625c9a38cf50aa319c7c Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 30 Aug 2020 15:33:01 +0200
 Subject: Increase default visible tiles

patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch

@@ -1,4 +1,4 @@
-From 49f74194e5a5fd8a21411233d88ad3ce94bd1210 Mon Sep 17 00:00:00 2001
+From 634c5b37c8240b4c86e3f2fc633d590094b83766 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 26 May 2024 10:43:36 +0200
 Subject: Bring back showSpaceDMBadges setting, force-enabled for now
@@ -12,10 +12,10 @@ Co-authored-by: SpiritCroc <dev@spiritcroc.de>
  2 files changed, 30 insertions(+)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index ac88f717d4..7295b716b8 100644
+index 07f0e8ac5b..6b4b8691e4 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -366,6 +366,11 @@ export const SETTINGS: Settings = {
+@@ -370,6 +370,11 @@ export const SETTINGS: Settings = {
          default: true,
          controller: new ReloadOnChangeController(),
      },

patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch

@@ -1,4 +1,4 @@
-From 51006640c610c9e4f02ffbf42a8674ff17783a05 Mon Sep 17 00:00:00 2001
+From 16752c3cd569176baa4a1999657489bdb14167ae Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 29 May 2024 19:32:42 +0200
 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

patches/element-web/0015-Allow-reactions-to-take-more-space.patch

@@ -1,4 +1,4 @@
-From cd61fbeec18a633e7e2ac0595f0d658cf14de3cc Mon Sep 17 00:00:00 2001
+From 509837ce45f4f37a0bc0c6130c29285cb2e34e61 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sat, 22 Apr 2023 12:15:18 +0200
 Subject: Allow reactions to take more space

patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch

@@ -1,4 +1,4 @@
-From 7ab1d126c752ffca96fadc55789f368438768a0b Mon Sep 17 00:00:00 2001
+From 0420f2dccbc4ec0bd4cb941366179cb367375d10 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Thu, 30 May 2024 14:35:16 +0200
 Subject: On space switch don't automatically show last opened room
@@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room
  3 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
-index cc69455a8a..d2208eca84 100644
+index e61713ca69..c7342758fb 100644
 --- a/src/components/structures/MatrixChat.tsx
 +++ b/src/components/structures/MatrixChat.tsx
-@@ -1416,7 +1416,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1476,7 +1476,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          if (this.screenAfterLogin && this.screenAfterLogin.screen) {
              this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
              this.screenAfterLogin = undefined;
@@ -30,7 +30,7 @@ index cc69455a8a..d2208eca84 100644
              // Before defaulting to directory, show the last viewed room
              this.viewLastRoom();
          } else {
-@@ -1428,6 +1436,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1488,6 +1496,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          }
      }
  
@@ -46,10 +46,10 @@ index cc69455a8a..d2208eca84 100644
          dis.dispatch<ViewRoomPayload>({
              action: Action.ViewRoom,
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 7295b716b8..cab6622f9a 100644
+index 6b4b8691e4..660078e587 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -371,6 +371,12 @@ export const SETTINGS: Settings = {
+@@ -375,6 +375,12 @@ export const SETTINGS: Settings = {
          supportedLevels: LEVELS_ACCOUNT_SETTINGS,
          default: true,
      },

patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch

@@ -1,4 +1,4 @@
-From 563a3f3f70dad3facfe3b7744f8286c5592ea74d Mon Sep 17 00:00:00 2001
+From 6c8665e4df4c8746d4a591b8fec5cf6cd0f1adce Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 9 Aug 2022 09:32:19 +0200
 Subject: Exclude spaces from breadcrumbs

patches/element-web/0018-Stop-the-search-bar-wobble.patch

@@ -1,4 +1,4 @@
-From cdbb2bedc2bb56ca332205ae308314ede303bf2d Mon Sep 17 00:00:00 2001
+From 73f866fd1c6597f377b6d2fc103d4c3d13aa4134 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Mon, 19 Aug 2024 20:27:33 +0200
 Subject: Stop the search bar wobble

patches/element-web/0019-Import-SC-compound-theme-overrides.patch

@@ -1,4 +1,4 @@
-From f72f3e0413572dfe15cbb1d4e103794f83195a10 Mon Sep 17 00:00:00 2001
+From 08adf3982a2b417488e877d74702c46c679d3601 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 11:23:54 +0200
 Subject: Import SC compound theme overrides

patches/element-web/0020-No-damn-avatar-background-in-room-list.patch

@@ -1,4 +1,4 @@
-From e0838fc65638230113af6039f99de5e897e74825 Mon Sep 17 00:00:00 2001
+From aabbb85608711034b170cec43e7846f1712ad081 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 7 Sep 2021 19:41:52 +0200
 Subject: No damn avatar background in room list

patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch

@@ -1,4 +1,4 @@
-From 551beff1e447a56948a874a336940fc48354d897 Mon Sep 17 00:00:00 2001
+From 3fd1d4e8c7847dd86e67cfe47415a6af19a803a0 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 22 Dec 2020 19:16:28 +0100
 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13

patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch

@@ -1,4 +1,4 @@
-From 66b83eef7b1c212cc808b41fc7f257931c9c9c6a Mon Sep 17 00:00:00 2001
+From 876855cbd4548a6b3a9c385edc51baaede597bf5 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:26:16 +0200
 Subject: Always apply corner radius to all edges of the bubble

patches/element-web/0023-Always-show-timestamps-by-default.patch

@@ -1,4 +1,4 @@
-From b755c4d712f402dd27e0c8631cf30a173c1d4605 Mon Sep 17 00:00:00 2001
+From 8a7ead9204a57f82597ebfb570f0e2b25e582cba Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:53:07 +0200
 Subject: Always show timestamps by default
@@ -8,10 +8,10 @@ Subject: Always show timestamps by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index cab6622f9a..01cb113acb 100644
+index 660078e587..0e8ea4fc8a 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -801,7 +801,7 @@ export const SETTINGS: Settings = {
+@@ -810,7 +810,7 @@ export const SETTINGS: Settings = {
      "alwaysShowTimestamps": {
          supportedLevels: LEVELS_ACCOUNT_SETTINGS,
          displayName: _td("settings|always_show_message_timestamps"),

patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch

@@ -1,4 +1,4 @@
-From 7c46305309b087c0d1d26cc77266532541307cb0 Mon Sep 17 00:00:00 2001
+From b869b99392687ab02392dfe65ca63c84fa48350e Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 17 Oct 2024 19:40:51 +0200
 Subject: Enable custom emote rendering by default
@@ -8,10 +8,10 @@ Subject: Enable custom emote rendering by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 01cb113acb..cd946a7eb5 100644
+index 0e8ea4fc8a..a5614769ef 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -656,7 +656,7 @@ export const SETTINGS: Settings = {
+@@ -665,7 +665,7 @@ export const SETTINGS: Settings = {
          description: _td("labs|render_reaction_images_description"),
          supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
          supportedLevelsAreOrdered: true,

patches/element-web/0025-Enable-chat-previews-by-default.patch

@@ -1,4 +1,4 @@
-From 6ae02f585f3334c368b3fac082ffcb25d59ee9bb Mon Sep 17 00:00:00 2001
+From ac3ef14f22410e343b12a591c8930f421478e69d Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:24:26 +0100
 Subject: Enable chat previews by default

patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch

@@ -1,4 +1,4 @@
-From 22a03cfd810b59c11ce61d9774e9929afd271789 Mon Sep 17 00:00:00 2001
+From 64f97a8d22b6a5469391f089384639289752900d Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 30 Nov 2024 19:42:44 +0100
 Subject: Disable showing people in spaces by default
@@ -9,10 +9,10 @@ Subject: Disable showing people in spaces by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index cd946a7eb5..fa840e88ca 100644
+index a5614769ef..5191a5de3c 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -1229,7 +1229,7 @@ export const SETTINGS: Settings = {
+@@ -1239,7 +1239,7 @@ export const SETTINGS: Settings = {
      },
      "Spaces.showPeopleInSpace": {
          supportedLevels: [SettingLevel.ROOM_ACCOUNT],

patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch

@@ -1,4 +1,4 @@
-From 55c47b4ce8cf3423bfe6a7db2fb7a0120d410f2b Mon Sep 17 00:00:00 2001
+From 8e2808848d50970bb19981d52ca4b54237b2ea69 Mon Sep 17 00:00:00 2001
 From: Suguru Hirahara <luixxiul@users.noreply.github.com>
 Date: Thu, 31 Oct 2024 13:44:20 -0400
 Subject: Improve IRC layout for SchildiChat