Element v1.11.112

Element v1.11.110
[TMP] Downgrade electron-builder to fix our desktop build
2025-09-17 08:59:43 +02:00 · 2025-09-02 08:12:43 +02:00 · 2025-08-15 15:58:24 +02:00 · 2025-08-11 20:56:04 +02:00 · 2025-08-09 12:21:32 +02:00 · 2025-07-19 12:12:10 +02:00
34 changed files with 105 additions and 127 deletions
--- a/README.md
+++ b/README.md
@ -52,10 +52,7 @@ export PATH="/C/Strawberry/perl/bin:$PATH:/C/Program Files/NASM:/C/Program Files
 ### Additional packages not mentioned upstream

 ```
-npm install yarn
-npm install gyp
-npm install electron-builder
-npm install @electron/fuses
+npm install --global yarn gyp electron-builder @electron/fuses
 pip install setuptools
 ```

@ -73,6 +70,9 @@ npm update <name>
    - Download [source code](https://github.com/electron-userland/electron-builder-binaries/releases/tag/winCodeSign-2.6.0) manually
    - Extract `electron-builder-binaries-winCodeSign-2.6.0.zip\electron-builder-binaries-winCodeSign-2.6.0\winCodeSign` to your `AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0
    - [Source](https://github.com/electron-userland/electron-builder/issues/8149#issuecomment-2328460139)
+- Some node function not found, e.g. `mixin.stripansi is not a function`
+    - Delete `npm` and `npm-cache` directories in your `AppData/Roaming`
+    - Re-execute the `npm install` command further above


 ## Release builds
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1bdb16230631237b790f54469a5b3f660bd4ad91
+Subproject commit 70cc4f218a32186cd3f06b136f5fb223128deafc
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0c751e1a25b3d7ca21830f076161c94887c887a9
+Subproject commit 4970f98fa2a99b779238fabb545ef0fd4fca92f9
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2c3bfff90d36697892ea7e32404751a896e26cc1
+Subproject commit 86076c05ce70fdb3705ae01260068be316108711
--- a/graphics/icon_gen.sh
+++ b/graphics/icon_gen.sh
@ -25,6 +25,9 @@ export_square() {
    in="$2"
    out="$3"
    export_rect "$1" "$size" "$in" "$out"
+    if [[ "$out" == *.png ]]; then
+        pngcrush -ow "$out"
+    fi
 }

 repo_dir="$SCHILDI_ROOT/element-web"
@ -50,50 +53,22 @@ export_rect 256 125 "$mydir/feature_image.svg" "$base_out/mstile-310x150.png"
 magick "$base_out/48.png" "$base_out/favicon.ico"
 rm "$base_out/48.png" # this was only created for favicon.ico

-for f in "$base_out"/*.png; do
-    pngcrush -ow "$f"
-done
-

 cp "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-logo.svg"

 export_square 320 "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-app-logo.png"

+
 repo_dir="$SCHILDI_ROOT/element-desktop"
-base_out="$repo_dir/res/img"
-
-export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/element.png"
-magick "$base_out/element.png" "$base_out/element.ico"
-
-# TODO monochrome icon? Unless https://github.com/element-hq/element-desktop/pull/1934 is what we'll end with
-export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/monochrome.png"
-magick "$base_out/element.png" "$base_out/monochrome.ico"
-
-for f in "$base_out"/*.png; do
-    pngcrush -ow "$f"
-done
-
-
-
-
 base_out="$repo_dir/build"

-for i in 16 24 48 64 96 128 256 512 1024; do
-    export_square "$i" "$mydir/ic_launcher_sc.svg" "$base_out/icons/$i"x"$i.png"
-done
-
-export_square "320" "$mydir/ic_launcher_sc.svg" "$base_out/install-spinner.png"
-pngcrush "$base_out/install-spinner.png"
-magick "$base_out/install-spinner.png" "$base_out/install-spinner.gif"
-rm  "$base_out/install-spinner.png"
-
-magick "$base_out/icons/256x256.png" "$base_out/icon.ico"
-magick "$base_out/icons/1024x1024.png" "$base_out/icon.icns"
-rm "$base_out/icons/1024x1024.png"
-
-for f in "$base_out/icons"/*.png; do
-    pngcrush -ow "$f"
-done
+export_square 512 "$mydir/ic_launcher_sc.svg" "$base_out/icon.png"
+export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/icon256_tmp.png"
+magick "$base_out/icon256_tmp.png" "$base_out/icon.ico"
+rm "$base_out/icon256_tmp.png"
+export_square 1024 "$mydir/ic_launcher_sc.svg" "$base_out/icon1024_tmp.png"
+magick "$base_out/icon1024_tmp.png" "$base_out/icon.icns"
+rm "$base_out/icon1024_tmp.png"


 if [[ "$automatic_commit" == [Yy]* ]]; then
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 40bc833bb79a7cfda376d7a7e94e9d6cab6169a7
+Subproject commit 4a9006aea68f9d4d7fad3965e754e89b03fb286f
--- a/overlay/element-desktop/package.json
+++ b/overlay/element-desktop/package.json
@ -2,9 +2,12 @@
  "name": "schildichat-desktop-alpha",
  "productName": "SchildiChatAlpha",
  "description": "A Matrix Client based on Element with some changes and tweaks",
-  "author": "SchildiChat",
+  "author": "SchildiChat <contact@schildi.chat> (https://schildi.chat)",
  "repository": {
    "url": "https://github.com/SchildiChat/schildichat-desktop"
  },
-  "homepage": "https://schildi.chat/"
+  "homepage": "https://schildi.chat/",
+  "devDependencies": {
+      "electron-builder": "26.0.15"
+  }
 }
--- a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch
+++ b/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 ecaabac117155c75dc2788545ad89bcd8761e6f6 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
@ -8,7 +8,7 @@ Subject: Add back schildi fetch-package.ts modifications
 1 file changed, 10 insertions(+), 4 deletions(-)

 diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts
-index 7282945..4be7ab0 100644
+index 72829454..4be7ab0b 100644
 --- a/scripts/fetch-package.ts
 +++ b/scripts/fetch-package.ts
@@ -54,6 +54,7 @@ async function main(): Promise<number | undefined> {
@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644
     if (!haveDeploy) {
         const outPath = path.join(pkgDir, filename);
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0002-Change-default-login-background.patch
+++ b/patches/element-web/0002-Change-default-login-background.patch
@ -1,4 +1,4 @@
-From 48bbd49a2be1a527b9521b9f026b0f33a08e1dae Mon Sep 17 00:00:00 2001
+From 8c704fc902b1a6c56ab32ef29b5bae3e60191ee5 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.51.0

--- a/patches/element-web/0003-Don-t-welcome-to-Element.patch
+++ b/patches/element-web/0003-Don-t-welcome-to-Element.patch
@ -1,4 +1,4 @@
-From 6c056866602edd92ccf8237c1fcce3cbaf1303f4 Mon Sep 17 00:00:00 2001
+From 48dd2747d8836ab5eff5d178222046a9f85b068e 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.51.0

--- a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
+++ b/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 1fce0445adfc9fed94951cfb9a9e370da8f4ef77 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.51.0

--- a/patches/element-web/0005-Schildify-login-footer.patch
+++ b/patches/element-web/0005-Schildify-login-footer.patch
@ -1,4 +1,4 @@
-From 9474a8c7f96f94c4a19380251121beb3c5a3c925 Mon Sep 17 00:00:00 2001
+From fb8b9391edb5bfeff518c45a067ef7682fbd51b3 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.51.0

--- a/patches/element-web/0006-Disable-sticky-rooms.patch
+++ b/patches/element-web/0006-Disable-sticky-rooms.patch
@ -1,4 +1,4 @@
-From c2efb5cd9f33a87ef2a900272d7845883fc62f6a Mon Sep 17 00:00:00 2001
+From 842db7d38306adb8b9f552c9cb857d327a2048e8 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.51.0

--- a/patches/element-web/0007-Bring-back-unified-room-list.patch
+++ b/patches/element-web/0007-Bring-back-unified-room-list.patch
@ -1,4 +1,4 @@
-From a05aa4750cc2c3e44ec9f9a9e17271b3d6d91f36 Mon Sep 17 00:00:00 2001
+From 63a20f24caca99c9fc2f94931bfbb4b94fc5488c 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 f0f52bbbf8..3a9f107565 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -359,6 +359,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
+@@ -370,6 +370,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
 export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
 
 export const SETTINGS: Settings = {
@ -147,10 +147,10 @@ index 36030713ec..ac88f717d4 100644
         isFeature: true,
         labsGroup: LabGroup.VoiceAndVideo,
 diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
-index 2fc396b8b3..0739857b0b 100644
+index c6675d7aa5..e4c48dd1f7 100644
 --- a/src/stores/room-list/RoomListStore.ts
 +++ b/src/stores/room-list/RoomListStore.ts
-@@ -494,6 +494,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -492,6 +492,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
                 this.setAndPersistListOrder(tag, listOrder);
             }
         }
@ -160,7 +160,7 @@ index 2fc396b8b3..0739857b0b 100644
     }
 
     private onAlgorithmListUpdated = (forceUpdate: boolean): void => {
-@@ -607,7 +610,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -605,7 +608,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
      */
     public getTagsForRoom(room: Room): TagID[] {
         const algorithmTags = this.algorithm.getTagsForRoom(room);
@ -263,5 +263,5 @@ index 78823cbc42..00883e2ad6 100644
     DefaultTagID.Conference,
     DefaultTagID.Untagged,
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
+++ b/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 5cf03f81782a056678c09df9dceeb36479df9c19 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.51.0

--- a/patches/element-web/0009-Don-t-preview-reactions.patch
+++ b/patches/element-web/0009-Don-t-preview-reactions.patch
@ -1,4 +1,4 @@
-From 2ced3032f04e97b57b3b21ff0bde91f95e4a3590 Mon Sep 17 00:00:00 2001
+From cb13fa5d01e40ec5e51dd4691a932ad676c471d2 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.51.0

--- a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
+++ b/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 c53a8446016c2157dbc7b2735f45fb1d3b74c883 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.51.0

--- a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
+++ b/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 374b8e2560014595134b6fe9159744c3b8393a53 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.51.0

--- a/patches/element-web/0012-Increase-default-visible-tiles.patch
+++ b/patches/element-web/0012-Increase-default-visible-tiles.patch
@ -1,4 +1,4 @@
-From 53fb54d47a30cb553776efd5c687f1f3dc4f1423 Mon Sep 17 00:00:00 2001
+From 2b71cfd3beb164cd15c9f67badce2bb4984536bc 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.51.0

--- a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
+++ b/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 7408ce839bd4d13cfff94671a0b5e06ac8825190 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 3a9f107565..44a2ea90ce 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -366,6 +366,11 @@ export const SETTINGS: Settings = {
+@@ -377,6 +377,11 @@ export const SETTINGS: Settings = {
         default: true,
         controller: new ReloadOnChangeController(),
     },
@ -28,7 +28,7 @@ index ac88f717d4..7295b716b8 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 bfb98f6b02..fd38bd0010 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@ -71,7 +71,7 @@ index 015c9fa0fd..c5c34c4e14 100644
                     if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
                         return s === dmBadgeSpace;
                     }
-@@ -1311,6 +1327,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -1312,6 +1328,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                         break;
                     }
 
@ -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.51.0

--- a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
+++ b/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 cbf193f830fb03d7f949e72a6073226a164a1462 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
@ -71,11 +71,11 @@ Date:   Tue Aug 17 11:29:22 2021 +0200
 2 files changed, 17 insertions(+)

 diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
-index 71659d579b..4acbfd1fcb 100644
+index 13caa817ae..01c5bf6db2 100644
 --- a/src/components/views/emojipicker/EmojiPicker.tsx
 +++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -29,6 +29,8 @@ import { Key } from "../../../Keyboard";
- import { clamp } from "../../../utils/numbers";
+ import { clamp } from "../../../shared-components/utils/numbers";
 import { type ButtonEvent } from "../elements/AccessibleButton";
 
 +import AccessibleButton from '../elements/AccessibleButton';
@ -131,5 +131,5 @@ index 11b3d9468a..7d369945fe 100644
                 isEmojiDisabled={this.isEmojiDisabled}
                 onFinished={this.props.onFinished}
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch
+++ b/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 96cad44b97108ad12f5f3d1fec364ff257d1e24d 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.51.0

--- a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
+++ b/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 e8052bf6d6fc81706fe9d84d613bb2496eab476e 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 aef4fcdaf0..8f3e4a3d73 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> {
+@@ -1477,7 +1477,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> {
+@@ -1489,6 +1497,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 44a2ea90ce..45acd909fb 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -371,6 +371,12 @@ export const SETTINGS: Settings = {
+@@ -382,6 +382,12 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: true,
     },
@ -63,7 +63,7 @@ index 7295b716b8..cab6622f9a 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 fd38bd0010..dcc99c4a94 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.51.0

--- a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
+++ b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
@ -1,4 +1,4 @@
-From 563a3f3f70dad3facfe3b7744f8286c5592ea74d Mon Sep 17 00:00:00 2001
+From 8c438c147b0a53630794ef3399daee4b9a4bf860 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
@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs
 1 file changed, 1 insertion(+)

 diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
-index e3b01cae0b..02f6c286f2 100644
+index 041430340e..239b1915f6 100644
 --- a/src/stores/BreadcrumbsStore.ts
 +++ b/src/stores/BreadcrumbsStore.ts
@@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
@ -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.51.0

--- a/patches/element-web/0018-Stop-the-search-bar-wobble.patch
+++ b/patches/element-web/0018-Stop-the-search-bar-wobble.patch
@ -1,4 +1,4 @@
-From cdbb2bedc2bb56ca332205ae308314ede303bf2d Mon Sep 17 00:00:00 2001
+From 08919d9b0b2fd8cc9dfc036232cccc0c300d3337 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.51.0

--- a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch
+++ b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch
@ -1,4 +1,4 @@
-From f72f3e0413572dfe15cbb1d4e103794f83195a10 Mon Sep 17 00:00:00 2001
+From 62e0a5859768ec8cccefd3c3286d20fc7b3989e2 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.51.0

--- a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
+++ b/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 1d219c553a67b500ff51039b7d43a9cea6017c0f 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.51.0

--- a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
+++ b/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 2739cd04d2943a900b7b6e2d82d0119da57078fb 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
@ -8,10 +8,10 @@ Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
 1 file changed, 6 insertions(+)

 diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
-index 2c10d0afd9..d46320e8c3 100644
+index 1379560d55..a732acf233 100644
 --- a/src/components/views/rooms/EventTile.tsx
 +++ b/src/components/views/rooms/EventTile.tsx
-@@ -681,6 +681,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
+@@ -683,6 +683,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             return false;
         }
 
@ -25,5 +25,5 @@ index 2c10d0afd9..d46320e8c3 100644
     }
 
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
+++ b/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 d402180b5de9d726665a19849ba3852400d6e2a8 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.51.0

--- a/patches/element-web/0023-Always-show-timestamps-by-default.patch
+++ b/patches/element-web/0023-Always-show-timestamps-by-default.patch
@ -1,4 +1,4 @@
-From b755c4d712f402dd27e0c8631cf30a173c1d4605 Mon Sep 17 00:00:00 2001
+From 6e5087cfb3eb77ed1970c179c9bc9a9bd4e7ef78 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 45acd909fb..bb63279adc 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -801,7 +801,7 @@ export const SETTINGS: Settings = {
+@@ -846,7 +846,7 @@ export const SETTINGS: Settings = {
     "alwaysShowTimestamps": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("settings|always_show_message_timestamps"),
@ -21,5 +21,5 @@ index cab6622f9a..01cb113acb 100644
     "userTimezone": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
+++ b/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 d7e9e6b3cee0a4b041674e5818d4a215065f2849 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 bb63279adc..ff94d6da5a 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -656,7 +656,7 @@ export const SETTINGS: Settings = {
+@@ -701,7 +701,7 @@ export const SETTINGS: Settings = {
         description: _td("labs|render_reaction_images_description"),
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
         supportedLevelsAreOrdered: true,
@ -21,5 +21,5 @@ index 01cb113acb..cd946a7eb5 100644
     "feature_new_room_list": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0025-Enable-chat-previews-by-default.patch
+++ b/patches/element-web/0025-Enable-chat-previews-by-default.patch
@ -1,4 +1,4 @@
-From 6ae02f585f3334c368b3fac082ffcb25d59ee9bb Mon Sep 17 00:00:00 2001
+From 1663a5f4bf95c858603ee929ad9e7d7b9eeb26ea 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.51.0

--- a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
+++ b/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 1b7806086868b9f20769143cdf6dd7f412e97642 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 ff94d6da5a..06c3d66f74 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -1229,7 +1229,7 @@ export const SETTINGS: Settings = {
+@@ -1298,7 +1298,7 @@ export const SETTINGS: Settings = {
     },
     "Spaces.showPeopleInSpace": {
         supportedLevels: [SettingLevel.ROOM_ACCOUNT],
@ -35,5 +35,5 @@ index 02e20e9103..2b49711c8e 100644
 
     public isVisible(room: Room): boolean {
 -- 
-2.49.0
+2.51.0

--- a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
+++ b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
@ -1,4 +1,4 @@
-From 55c47b4ce8cf3423bfe6a7db2fb7a0120d410f2b Mon Sep 17 00:00:00 2001
+From b47fb62f1d7459cabbe5419266748a003eb71dc5 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.51.0
Author	SHA1	Message	Date
SpiritCroc	4d4dcf1f7b	Element v1.11.112	2025-09-17 08:59:43 +02:00
SpiritCroc	4fc61c878b	Element v1.11.110	2025-09-02 08:12:43 +02:00
SpiritCroc	3b05766cd5	[TMP] Downgrade electron-builder to fix our desktop build Changelog to 26.0.16 doesn't mention any behavioral changes, still it breaks our build, and our previous workaround to that still broke the build in different ways. It is still broken until 26.0.19. We'll need to figure this out in the future.	2025-08-15 15:58:24 +02:00
SpiritCroc	816fad107e	Element v1.11.109	2025-08-11 20:56:04 +02:00
SpiritCroc	aa8e762337	Element v1.11.108	2025-08-09 12:21:32 +02:00
SpiritCroc	6edf34e948	Upstream v1.11.106	2025-07-19 12:12:10 +02:00
SpiritCroc	2029ad5729	Fix build for new electron-builder (I assume)	2025-07-01 20:02:28 +02:00
SpiritCroc	c9862d0fc5	Upstream v1.11.105	2025-07-01 18:21:47 +02:00
SpiritCroc	de42aa3549	Upstream v1.11.104	2025-06-27 10:49:40 +02:00
SpiritCroc	faf85272a7	Update README to latest Windows build quirks	2025-06-10 20:46:17 +02:00