Upstream v1.11.85

SchildiChat · Nov 13, 2024 · 491ad5a · 491ad5a
1 parent 122f9d3
commit 491ad5a
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/element-desktop b/element-desktop
diff --git a/element-web b/element-web
diff --git a/matrix-js-sdk b/matrix-js-sdk
diff --git 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 cc7713f0d356bbdfec28f4e45621bec009bd5d4f Mon Sep 17 00:00:00 2001
+From 113e92563afce88425b4b0aaa6434533a34d2d76 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sat, 2 Dec 2023 12:57:26 +0100
 Subject: Add back schildi fetch-package.ts modifications

diff --git 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 06d1240007439dd832832ac978afe7da5a88ddaf Mon Sep 17 00:00:00 2001
+From b5f628c25a4e559173dc908cb843bd95cc4ab387 Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Sun, 29 Nov 2020 23:30:59 +0100
 Subject: Change default login background

diff --git 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 b7a7c3dd5e6d3c987e9c8bc282782de7e9db5b3c Mon Sep 17 00:00:00 2001
+From b5810ea474868e9059c5a87eb4dd4e4441588240 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 27 Oct 2024 19:38:47 +0100
 Subject: Don't welcome to Element

diff --git 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 c61604e39c87214291ea12642f01d675fe0627c4 Mon Sep 17 00:00:00 2001
+From 7ec0394f9adabfd60d0bb94bcb05681870d78226 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 27 Oct 2024 19:55:30 +0100
 Subject: Stronger login background to ensure contrast of our icon with our bg

diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch
@@ -1,4 +1,4 @@
-From ff667234d77fc02ac67926033a0c3ff00dc4489d Mon Sep 17 00:00:00 2001
+From 29f48d9d9c07f0ad9b46a235b7b47240a6763a84 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 27 Oct 2024 20:07:30 +0100
 Subject: Schildify login footer

diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch
@@ -1,4 +1,4 @@
-From e2c422af878b5990a887f3f5f2ba3ff22ab39adf Mon Sep 17 00:00:00 2001
+From 7c034d6b2ef4f6133cd022c1d80d4a80513f9576 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Tue, 18 Jan 2022 13:28:22 +0100
 Subject: Disable sticky rooms

diff --git 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 a8890771194bbf3f6ff9d71bb9a2a26d5339ab92 Mon Sep 17 00:00:00 2001
+From b9a3556344a0689d84e08959e163153f4ac724a1 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 5 May 2024 10:12:17 +0200
 Subject: Bring back unified room list

diff --git 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 317836cb914f63ce1638cf58120fd4a6e0cf8ce7 Mon Sep 17 00:00:00 2001
+From 2ddade0c24cd4010d11539e2a4d986f1fee925bd Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 17 Dec 2023 11:11:58 +0100
 Subject: Don't sort muted rooms to bottom, I still want to see them.

diff --git 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 d91a802b64a96e4dea3e7c2845de35d4cff54768 Mon Sep 17 00:00:00 2001
+From 48d99af8575f9591d2ac445a64f9b70c54a651b5 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Thu, 14 Dec 2023 10:32:10 +0100
 Subject: Don't preview reactions

diff --git 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 12f827c0187199ef1b1a456157086c7f8fd26844 Mon Sep 17 00:00:00 2001
+From 029aa23e06c76b25bc3ec6c58cd0dbbd5b19b850 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Wed, 17 Nov 2021 12:50:25 +0100
 Subject: Hide the "mute" notification state the same way as the other states

diff --git 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 e58358778fdc62b13511a46415a88d12a1abbf79 Mon Sep 17 00:00:00 2001
+From 96de0aab889c70f5a9f93a24cbf9fd117d509154 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Fri, 10 May 2024 18:58:32 +0200
 Subject: Allow muted rooms to render as unread

diff --git 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 5cf1c61cb065992d2ff393226f3cae75c38ea454 Mon Sep 17 00:00:00 2001
+From d67cf80d32b04f528fc2512a8a9a1c22125a2cdb Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 30 Aug 2020 15:33:01 +0200
 Subject: Increase default visible tiles

diff --git 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 093dc261427a31ffecde5915468db4fe5e46aa03 Mon Sep 17 00:00:00 2001
+From cf656380d43b9ca289fec93b78dfab592ab04756 Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Sun, 26 May 2024 10:43:36 +0200
 Subject: Bring back showSpaceDMBadges setting, force-enabled for now

diff --git 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 da8670b63eda52c5bc5f00c09d8c549138c76e30 Mon Sep 17 00:00:00 2001
+From aadba9f508f6227192d7e4409f10c5996c9b713b Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Wed, 29 May 2024 19:32:42 +0200
 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

diff --git 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 0813296bf991b0160bc2972ea69813c082075ccc Mon Sep 17 00:00:00 2001
+From 08034162fa822b2bc76c709b4374001f766d856d Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Sat, 22 Apr 2023 12:15:18 +0200
 Subject: Allow reactions to take more space

diff --git 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 7f814c860e61393126e87defabf29d437ec3304d Mon Sep 17 00:00:00 2001
+From 6c48df6f72f68e8e972408cee568584274f1894d Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Thu, 30 May 2024 14:35:16 +0200
 Subject: On space switch don't automatically show last opened room

diff --git 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 f6afae8736d1a631a52812411cf903bffbcb9bfc Mon Sep 17 00:00:00 2001
+From 6fde2e8e1e827b5ca4e4fd719ee4651061fbc682 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Tue, 9 Aug 2022 09:32:19 +0200
 Subject: Exclude spaces from breadcrumbs

diff --git 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 46803e11241274c1394337f8218a7fa67f9a9b6d Mon Sep 17 00:00:00 2001
+From 90b33a99e72375d4276677a5673c2db30df2e962 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Mon, 19 Aug 2024 20:27:33 +0200
 Subject: Stop the search bar wobble

diff --git 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 15a9a0630ff5448b77cf1d35339f7de66d631ce6 Mon Sep 17 00:00:00 2001
+From 799670123ab61935532f19c509a58c745f8771ae Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 13 Oct 2024 11:23:54 +0200
 Subject: Import SC compound theme overrides

diff --git 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 f1b84b5f01c6e6602b683e076318ae637fdb1cc0 Mon Sep 17 00:00:00 2001
+From fbae86033a88de5c3096d288ef0f31e1f9e76b17 Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Tue, 7 Sep 2021 19:41:52 +0200
 Subject: No damn avatar background in room list

diff --git 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 4b707e1ab87ebf03a9b099f42d0cd66a0e132921 Mon Sep 17 00:00:00 2001
+From 4b223e86bbd72d5e72ecdb07510353b8472bc7d4 Mon Sep 17 00:00:00 2001
 From: su-ex <[email protected]>
 Date: Tue, 22 Dec 2020 19:16:28 +0100
 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13

diff --git 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 cb1170ababf572e6caf211e3ed865b693ead7b61 Mon Sep 17 00:00:00 2001
+From bde0c9e75353f96ef5acbe221388876c5e19c70e Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 13 Oct 2024 13:26:16 +0200
 Subject: Always apply corner radius to all edges of the bubble

diff --git 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 67290a6973214d7264bed8fa5afc75ca10dd87a2 Mon Sep 17 00:00:00 2001
+From 9cb9230125510ae19454df7aa9e951366c1318ed Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 13 Oct 2024 13:53:07 +0200
 Subject: Always show timestamps by default

diff --git 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 f8b25cb34f98c6b0cea0ee718532dfe396252523 Mon Sep 17 00:00:00 2001
+From c28be530405d5493e0d9f74a3fe0396590677bf2 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Thu, 17 Oct 2024 19:40:51 +0200
 Subject: Enable custom emote rendering by default

diff --git 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 12cc7c8a59618ab8a81bf5ceabea3b81dfc6ac21 Mon Sep 17 00:00:00 2001
+From 9a2e3ae755e824d5d94b8249479a2232d4c87482 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Sun, 27 Oct 2024 19:24:26 +0100
 Subject: Enable chat previews by default

diff --git a/patches/element-web/0026-Fix-captions-in-bubble-layout.patch b/patches/element-web/0026-Fix-captions-in-bubble-layout.patch
@@ -1,4 +1,4 @@
-From 1e97903a5d3d245cb0904f1e93ac85a536080dda Mon Sep 17 00:00:00 2001
+From 97906c2d4572126b2b9f6118f8e5393bb47fd292 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <[email protected]>
 Date: Thu, 31 Oct 2024 17:33:32 +0100
 Subject: Fix captions in bubble layout
+8 −0		CHANGELOG.md
+1 −1		jest.config.ts
+3 −2		package.json
+101 −60		playwright/e2e/widgets/stickers.spec.ts
+23 −19		src/components/views/messages/DateSeparator.tsx
+107 −0		src/components/views/messages/MessageEvent.tsx
+1 −0		src/i18n/strings/en_EN.json
+6 −0		test/unit-tests/components/views/messages/DateSeparator-test.tsx
+47 −7		test/unit-tests/components/views/messages/MessageEvent-test.tsx
+27 −0		test/unit-tests/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
+9 −4		yarn.lock
+10 −0		CHANGELOG.md
+1 −1		package.json
+25 −14		spec/unit/content-repo.spec.ts
+35 −30		src/content-repo.ts