Skip to content

Commit

Permalink
Upstream v1.11.84
Browse files Browse the repository at this point in the history
  • Loading branch information
SpiritCroc committed Nov 10, 2024
1 parent 735143f commit 122f9d3
Show file tree
Hide file tree
Showing 29 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion element-desktop
2 changes: 1 addition & 1 deletion element-web
Submodule element-web updated 3 files
+25 −0 CHANGELOG.md
+1 −1 package.json
+4 −4 yarn.lock
2 changes: 1 addition & 1 deletion matrix-js-sdk
Submodule matrix-js-sdk updated 2 files
+23 −0 CHANGELOG.md
+1 −1 package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8bf07f17ee205abe08fd47e5615d7f79ff60eced Mon Sep 17 00:00:00 2001
From cc7713f0d356bbdfec28f4e45621bec009bd5d4f 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b3b4e755efb1851b4790cdedf230cf85f64d775d Mon Sep 17 00:00:00 2001
From 06d1240007439dd832832ac978afe7da5a88ddaf 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
Expand Down
2 changes: 1 addition & 1 deletion patches/element-web/0003-Don-t-welcome-to-Element.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fe40e94fc7092912bca454f1c2c197ca42c7dccd Mon Sep 17 00:00:00 2001
From b7a7c3dd5e6d3c987e9c8bc282782de7e9db5b3c 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4a593cab4f41b9ac0b07b43c3574d77d4d85238d Mon Sep 17 00:00:00 2001
From c61604e39c87214291ea12642f01d675fe0627c4 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
Expand Down
2 changes: 1 addition & 1 deletion patches/element-web/0005-Schildify-login-footer.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 113e105d802f904e9cfdc3dca4cb6a74f4ae259a Mon Sep 17 00:00:00 2001
From ff667234d77fc02ac67926033a0c3ff00dc4489d Mon Sep 17 00:00:00 2001
From: SpiritCroc <[email protected]>
Date: Sun, 27 Oct 2024 20:07:30 +0100
Subject: Schildify login footer
Expand Down
2 changes: 1 addition & 1 deletion patches/element-web/0006-Disable-sticky-rooms.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 89ffe82738128afc556bdbf5e07a1ed05640a78b Mon Sep 17 00:00:00 2001
From e2c422af878b5990a887f3f5f2ba3ff22ab39adf Mon Sep 17 00:00:00 2001
From: SpiritCroc <[email protected]>
Date: Tue, 18 Jan 2022 13:28:22 +0100
Subject: Disable sticky rooms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From aa67c52dbb37da389722571f480f1d391598bb77 Mon Sep 17 00:00:00 2001
From a8890771194bbf3f6ff9d71bb9a2a26d5339ab92 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 52a8331e22a92e72cd470924a898bb5dc0050c12 Mon Sep 17 00:00:00 2001
From 317836cb914f63ce1638cf58120fd4a6e0cf8ce7 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.
Expand Down
2 changes: 1 addition & 1 deletion patches/element-web/0009-Don-t-preview-reactions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6b180bc740d00b2c12e7484611436ed0a0441d91 Mon Sep 17 00:00:00 2001
From d91a802b64a96e4dea3e7c2845de35d4cff54768 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c8326bf3b2024cb21dae646d552f440e8be31a92 Mon Sep 17 00:00:00 2001
From 12f827c0187199ef1b1a456157086c7f8fd26844 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ad6ae2391b4e9ffafcdfd9a9cd369e77714f8e92 Mon Sep 17 00:00:00 2001
From e58358778fdc62b13511a46415a88d12a1abbf79 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bdd02fd32781cbd9f592bee2dece18e758a4b0a3 Mon Sep 17 00:00:00 2001
From 5cf1c61cb065992d2ff393226f3cae75c38ea454 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1a73e666d193a583aa025fb75a9afdf59f1d36fa Mon Sep 17 00:00:00 2001
From 093dc261427a31ffecde5915468db4fe5e46aa03 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 911b4438f6f2240e99d3a80aed35ff3e4f1d70ff Mon Sep 17 00:00:00 2001
From da8670b63eda52c5bc5f00c09d8c549138c76e30 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3d8a7358ea859b70bd713e758cb3efc273eb56ef Mon Sep 17 00:00:00 2001
From 0813296bf991b0160bc2972ea69813c082075ccc 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 89e083af2be11b17c756c6078a43ce1c6c305cc2 Mon Sep 17 00:00:00 2001
From 7f814c860e61393126e87defabf29d437ec3304d 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ddf0d3e26a63b1c3602a78dc3f2253f170e93b90 Mon Sep 17 00:00:00 2001
From f6afae8736d1a631a52812411cf903bffbcb9bfc 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
Expand Down
2 changes: 1 addition & 1 deletion patches/element-web/0018-Stop-the-search-bar-wobble.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 684ed334d998c827cfadfdf1c5f46e5b6db722bc Mon Sep 17 00:00:00 2001
From 46803e11241274c1394337f8218a7fa67f9a9b6d 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fb1f422cbea4bb050088e5dbb02c342e70a2aebb Mon Sep 17 00:00:00 2001
From 15a9a0630ff5448b77cf1d35339f7de66d631ce6 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From da372cc9cf48128a4918917298c3904f0773e7ae Mon Sep 17 00:00:00 2001
From f1b84b5f01c6e6602b683e076318ae637fdb1cc0 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0fa53f5f6b26b88aed25ab425ba04ebc28509684 Mon Sep 17 00:00:00 2001
From 4b707e1ab87ebf03a9b099f42d0cd66a0e132921 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6c031a5258cc31485b889b5487d5e44ebac2c8de Mon Sep 17 00:00:00 2001
From cb1170ababf572e6caf211e3ed865b693ead7b61 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a59cf2ab1fc5483be4ab0a157072d6bec18d052 Mon Sep 17 00:00:00 2001
From 67290a6973214d7264bed8fa5afc75ca10dd87a2 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2968ddb18dfe25fb1f0aaa08e796a7d0960e4263 Mon Sep 17 00:00:00 2001
From f8b25cb34f98c6b0cea0ee718532dfe396252523 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From de706cd1c2fcca44f8c04467f675477045572670 Mon Sep 17 00:00:00 2001
From 12cc7c8a59618ab8a81bf5ceabea3b81dfc6ac21 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From df4aa42a9915f1fbf6a70e84b01913dd41e2ac0e Mon Sep 17 00:00:00 2001
From 1e97903a5d3d245cb0904f1e93ac85a536080dda Mon Sep 17 00:00:00 2001
From: SpiritCroc <[email protected]>
Date: Thu, 31 Oct 2024 17:33:32 +0100
Subject: [HACK] Fix captions in bubble layout
Subject: Fix captions in bubble layout

Image height of 100% combined with overflow-y: hidden was causing
caption to be invisible in bubble layout.
Expand Down

0 comments on commit 122f9d3

Please sign in to comment.