Upstream v1.11.105

compound-web

@@ -1 +1 @@
-Subproject commit 1bdb16230631237b790f54469a5b3f660bd4ad91
+Subproject commit 70cc4f218a32186cd3f06b136f5fb223128deafc

element-desktop

@@ -1 +1 @@
-Subproject commit 4815d02ac15dc8e8371a5b0b3deac7879c463373
+Subproject commit a1b6cbf692d94d69fb449c2ef5f46f88f14bc4b0

element-web

@@ -1 +1 @@
-Subproject commit 3742a6cef8258430c592afc42bedc9d776a67527
+Subproject commit 1c6f7d2ffe8c690af933304e89b85eb41aebb839

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 28bc90563e86cd087c7cebe4ccd04c3c47842337
+Subproject commit b095aa600d86b6a9cfa6ac23727f7a9ea90bbdf3

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

@@ -1,4 +1,4 @@
-From cadd0ad4af331ffe0d1fa53b604ef86449a20415 Mon Sep 17 00:00:00 2001
+From b39ae00380dddc7e263b27807c0366f314f45c63 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
@@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644
      if (!haveDeploy) {
          const outPath = path.join(pkgDir, filename);
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 1028d2669b77bcd03372f8d518f1907613532a2c Mon Sep 17 00:00:00 2001
+From 824b310a739bf1695728935dc97400db08434ed2 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
@@ -23625,5 +23625,5 @@ index ef0d6e57fc..bfc0c58a68 100644
                                              target="_blank"
                                          >
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From a3b7f14f8ffda860d95cbcff2a32e2208536577f Mon Sep 17 00:00:00 2001
+From b7900f6a3124368f650275f9779c4a7fdde682af 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
@@ -21,5 +21,5 @@ index 9fdd60a7c0..453baab965 100644
      <h4 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h4>
      <div class="mx_ButtonGroup">
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 8970c2529da9f474e838204ca2a8145b0fe35317 Mon Sep 17 00:00:00 2001
+From 86879650c5a50bb7f927c7db854a0eba348b46bf 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
@@ -21,5 +21,5 @@ index 3c7fe2503e..64163e837c 100644
          };
  
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 0ed74da29cf1fe5e754b2652a198a5e9a46e5cbf Mon Sep 17 00:00:00 2001
+From dde1fa58e2e7f5ac59338dbd30d7ca72523aa317 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
@@ -26,5 +26,5 @@ index 1942bf0431..1054d06f89 100644
  
      const authFooterLinks: JSX.Element[] = [];
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 75a7434cf02dddb10a943f64a0bd66f25c4f89de Mon Sep 17 00:00:00 2001
+From 54a268f01a49bcfb14841141a3cabadb7ef39bbf 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
@@ -25,5 +25,5 @@ index 5419a6e47c..25d6b78fde 100644
      }
  
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 71b9a77c5ef501b8c2993542fe0db9051452b889 Mon Sep 17 00:00:00 2001
+From 94a2d8bd966955b0a9a8a8acf1d2f80c5533a622 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
@@ -263,5 +263,5 @@ index 78823cbc42..00883e2ad6 100644
      DefaultTagID.Conference,
      DefaultTagID.Untagged,
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 74dda33af1f2ac88589ca136be1d76de544e7b9b Mon Sep 17 00:00:00 2001
+From 73967c3ba484e15687c575a6b3d06e6ae9cb88a5 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.
@@ -21,5 +21,5 @@ index 0f95fe78c2..2de554c357 100644
  
      /**
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From f778dbe376a0305e03d811edff99e3e3a9203ae8 Mon Sep 17 00:00:00 2001
+From 48a433efbaba29e958872dbd3577b02afb4d89bd 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
@@ -25,5 +25,5 @@ index 51e413940d..7775d1e52a 100644
          isState: false,
          previewer: new PollStartEventPreview(),
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From f951c326f3a30edff1eea255a32ef840db347505 Mon Sep 17 00:00:00 2001
+From 449154bbf6276155e0a06d1aca9042090e8fad75 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
@@ -26,5 +26,5 @@ index 3eafb671cb..c9dcd00fd0 100644
  
          return (
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From b196b6d8b102eb48a23205dcc5a89256ba0569d1 Mon Sep 17 00:00:00 2001
+From a91b3b854403f80d32962ce2713859a48e8192a3 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
@@ -21,5 +21,5 @@ index d5254d523d..9cb1e24d1d 100644
      }
  
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From b24179372bb18ac0eec1625c9a38cf50aa319c7c Mon Sep 17 00:00:00 2001
+From 4a6f7d7b462b763d453f9678610d7b971e9bce03 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
@@ -21,5 +21,5 @@ index a4468dfffe..a4ae9bbc1d 100644
  
      public tilesWithPadding(n: number, paddingPx: number): number {
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 634c5b37c8240b4c86e3f2fc633d590094b83766 Mon Sep 17 00:00:00 2001
+From 551ba0bbbc34451110d0dd8dc4dd6a4bcf5273c3 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
@@ -28,7 +28,7 @@ index 07f0e8ac5b..6b4b8691e4 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index 015c9fa0fd..c5c34c4e14 100644
+index 2945d486c2..f004ce149f 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
 @@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -88,5 +88,5 @@ index 015c9fa0fd..c5c34c4e14 100644
                          const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
                          const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]);
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 16752c3cd569176baa4a1999657489bdb14167ae Mon Sep 17 00:00:00 2001
+From 435b91ac19f73e8a6eba4ff26ef8e2f6a44de992 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
@@ -131,5 +131,5 @@ index 11b3d9468a..7d369945fe 100644
                  isEmojiDisabled={this.isEmojiDisabled}
                  onFinished={this.props.onFinished}
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 509837ce45f4f37a0bc0c6130c29285cb2e34e61 Mon Sep 17 00:00:00 2001
+From 43cffa56c585c68a807d85c143da8a8ca46fd91d 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
@@ -28,5 +28,5 @@ index 917bcfbb84..75ec572c9e 100644
          white-space: nowrap;
          text-overflow: ellipsis;
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 0420f2dccbc4ec0bd4cb941366179cb367375d10 Mon Sep 17 00:00:00 2001
+From 1e93c84b9db5c7d562420f39ac1c7f1304ab4f48 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
@@ -63,7 +63,7 @@ index 6b4b8691e4..660078e587 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index c5c34c4e14..9c0090d9cc 100644
+index f004ce149f..23b55c234f 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
 @@ -287,6 +287,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -75,5 +75,5 @@ index c5c34c4e14..9c0090d9cc 100644
                  cliSpace?.getMyMembership() !== KnownMembership.Invite &&
                  this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 6c8665e4df4c8746d4a591b8fec5cf6cd0f1adce Mon Sep 17 00:00:00 2001
+From b0ecf3a47581d9966c59834d7e8f8d6fe245c8b7 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
@@ -20,5 +20,5 @@ index e3b01cae0b..02f6c286f2 100644
          const rooms = (this.state.rooms || []).slice(); // cheap clone
          const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 73f866fd1c6597f377b6d2fc103d4c3d13aa4134 Mon Sep 17 00:00:00 2001
+From 4b9ee7630078e3996f68c2b75043db1db5503be6 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
@@ -20,5 +20,5 @@ index 3eed8c93c6..caaa0df3b9 100644
  
  /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 08adf3982a2b417488e877d74702c46c679d3601 Mon Sep 17 00:00:00 2001
+From a71857a0c2b2569748ef948730a4a74596679bbe 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
@@ -20,5 +20,5 @@ index caaa0df3b9..44c83ecd83 100644
  @import "./_animations.pcss";
  @import "./_spacing.pcss";
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From aabbb85608711034b170cec43e7846f1712ad081 Mon Sep 17 00:00:00 2001
+From 50a311a5ed35b91313ce54d0949443fb454a9db4 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
@@ -22,5 +22,5 @@ index f3a44521fa..396601ba6e 100644
  
      const styles: CSSProperties = {};
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 3fd1d4e8c7847dd86e67cfe47415a6af19a803a0 Mon Sep 17 00:00:00 2001
+From c6c32debf2e4c90047784002aab3786d63156270 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
@@ -25,5 +25,5 @@ index 2c10d0afd9..d46320e8c3 100644
      }
  
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 876855cbd4548a6b3a9c385edc51baaede597bf5 Mon Sep 17 00:00:00 2001
+From cd5783811ba06c356fa99cbeef1a9af940278020 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
@@ -57,5 +57,5 @@ index 1607c45924..aa69fbf07f 100644
      }
      &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line {
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 8a7ead9204a57f82597ebfb570f0e2b25e582cba Mon Sep 17 00:00:00 2001
+From 94132b499902370367def8220cf29d0be3a3edda 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
@@ -21,5 +21,5 @@ index 660078e587..0e8ea4fc8a 100644
      "userTimezone": {
          supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From b869b99392687ab02392dfe65ca63c84fa48350e Mon Sep 17 00:00:00 2001
+From dcb90ec522541c6c451d5e1daa509c01cc5cc537 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
@@ -21,5 +21,5 @@ index 0e8ea4fc8a..a5614769ef 100644
      "feature_new_room_list": {
          supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From ac3ef14f22410e343b12a591c8930f421478e69d Mon Sep 17 00:00:00 2001
+From 1c6bfc621590fff6896acc3cc84dba5d66db27b5 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
@@ -21,5 +21,5 @@ index a4ae9bbc1d..227c918457 100644
  
      public constructor(public readonly tagId: TagID) {
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 64f97a8d22b6a5469391f089384639289752900d Mon Sep 17 00:00:00 2001
+From 658b6228d8c86881e17f012b923aaa1a6035b9fa 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
@@ -35,5 +35,5 @@ index 02e20e9103..2b49711c8e 100644
  
      public isVisible(room: Room): boolean {
 -- 
-2.49.0
+2.50.0
 

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

@@ -1,4 +1,4 @@
-From 8e2808848d50970bb19981d52ca4b54237b2ea69 Mon Sep 17 00:00:00 2001
+From e009f8f0707de178a0b095b07a5d0d9bec4c707c 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
@@ -306,5 +306,5 @@ index 953a0c941f..3326d0c0ff 100644
      line-height: var(--line-height) !important;
  
 -- 
-2.49.0
+2.50.0