diff --git a/RELEASE.md b/RELEASE.md index b4782e7..128d761 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,7 +5,7 @@ On a Linux machine with podman: ``` -make linux-container-release +make container-release-linux ``` ## Build Windows releases diff --git a/compound-web b/compound-web index 21c9660..141771e 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 21c96607d1304aebf422bc64510ca4fa9fba520a +Subproject commit 141771eb303d48dc388b2e5a01504359ad47b2c1 diff --git a/element-desktop b/element-desktop index 6ecb5b9..f115ac7 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6ecb5b93427770117bafd283c072d9169f68e06d +Subproject commit f115ac7ad03f7efa8e0a3e8dca782e455b766277 diff --git a/element-web b/element-web index 27bdedd..cacb1a6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 27bdedd5447d7070b97ecfbfd224d786a7cc4504 +Subproject commit cacb1a60db7dc15ee7cb9827e0bf83d308bc4baa diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index 32f3a81..780ce7a 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -57,7 +57,6 @@ 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" diff --git a/matrix-js-sdk b/matrix-js-sdk index f7bab54..cf06547 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit f7bab544a795bd8c0cba919d8b261ea639518f49 +Subproject commit cf065470630197affee1dea84f1c7e95df6c0ddf 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 index dd6638f..8bda598 100644 --- 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 23c8be7b910bc0532850d4fe87dd810e8f556ad9 Mon Sep 17 00:00:00 2001 +From 1be2423147ba91f51bf2cc0437b3652c5a4e0c00 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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.47.0 diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index cc56dec..c8d6033 100644 --- 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 e1d54c00c828581c54de7db81a3822fe40f0da0f Mon Sep 17 00:00:00 2001 +From f279bd0bb4f21f48341a937510535ca30a4216d1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background @@ -22104,7 +22104,7 @@ literal 0 HcmV?d00001 diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx -index dd3facaa79..3c7fe2503e 100644 +index 2782d0a641..032744413f 100644 --- a/src/components/views/auth/AuthPage.tsx +++ b/src/components/views/auth/AuthPage.tsx @@ -20,7 +20,7 @@ export default class AuthPage extends React.PureComponent { photo: (sub) => ( -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0003-Don-t-welcome-to-Element.patch b/patches/element-web/0003-Don-t-welcome-to-Element.patch index 559b6f6..13460db 100644 --- 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 0d8678e982413d2a76d3e842e314fe173ed70b3c Mon Sep 17 00:00:00 2001 +From 60fa47ee055ed85728583c12ab4619a7576d260e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element @@ -21,5 +21,5 @@ index ef2d43bd8f..5b71670f4f 100644

_t("powered_by_matrix_with_logo")

-- -2.49.0 +2.47.0 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 index 61dc861..c300988 100644 --- 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 6385be0c76621d18084d54b83089ccb67c096513 Mon Sep 17 00:00:00 2001 +From faaf99c6ce2111faeeaa3100cd076a51b711d95b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:55:30 +0100 Subject: Stronger login background to ensure contrast of our icon with our bg @@ -8,7 +8,7 @@ Subject: Stronger login background to ensure contrast of our icon with our bg 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx -index 3c7fe2503e..64163e837c 100644 +index 032744413f..71bf8ae6d6 100644 --- a/src/components/views/auth/AuthPage.tsx +++ b/src/components/views/auth/AuthPage.tsx @@ -58,7 +58,7 @@ export default class AuthPage extends React.PureComponent Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index 1942bf0431..1054d06f89 100644 +index 8d27a04c83..b9ff8e8416 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; @@ -17,7 +17,7 @@ index 1942bf0431..1054d06f89 100644 const links = brandingConfig?.get("auth_footer_links") ?? [ + /* { text: "Blog", url: "https://element.io/blog" }, - { text: "Mastodon", url: "https://mastodon.matrix.org/@Element" }, + { text: "Twitter", url: "https://twitter.com/element_hq" }, { text: "GitHub", url: "https://github.com/element-hq/element-web" }, + */ + { text: "About", url: "https://schildi.chat" }, @@ -26,5 +26,5 @@ index 1942bf0431..1054d06f89 100644 const authFooterLinks: JSX.Element[] = []; -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index d4ed585..8b8506b 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 70d03387cd78e193b9d37a97f5aacab9e25f926f Mon Sep 17 00:00:00 2001 +From 909d0c76ad56426699d9b8dfaebf818f21c09dd4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -8,7 +8,7 @@ Subject: Disable sticky rooms 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 5419a6e47c..25d6b78fde 100644 +index c3450d70cf..e296676149 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter { @@ -25,5 +25,5 @@ index 5419a6e47c..25d6b78fde 100644 } -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch index dd7dc94..6ced274 100644 --- 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 b81d62dc80dc7efdab2996c79662c4626302a8d0 Mon Sep 17 00:00:00 2001 +From 9cf40d600e00770aa7a56cebf5ab3413166e29e6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -8,18 +8,18 @@ Remaining TODO: Co-authored-by: su-ex --- - src/components/views/rooms/LegacyRoomList.tsx | 39 ++++++++++++++++++- - src/settings/Settings.tsx | 8 ++++ - src/stores/room-list/RoomListStore.ts | 19 ++++++++- - src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++-- - src/stores/room-list/models.ts | 2 + + src/components/views/rooms/RoomList.tsx | 39 +++++++++++++++++++- + src/settings/Settings.tsx | 8 ++++ + src/stores/room-list/RoomListStore.ts | 19 +++++++++- + src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++-- + src/stores/room-list/models.ts | 2 + 5 files changed, 83 insertions(+), 5 deletions(-) -diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx -index 6be226a172..dbb69d8f62 100644 ---- a/src/components/views/rooms/LegacyRoomList.tsx -+++ b/src/components/views/rooms/LegacyRoomList.tsx -@@ -83,11 +83,13 @@ interface IState { +diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx +index 853bebc4fe..5af0c642bc 100644 +--- a/src/components/views/rooms/RoomList.tsx ++++ b/src/components/views/rooms/RoomList.tsx +@@ -72,11 +72,13 @@ interface IState { sublists: ITagMap; currentRoomId?: string; suggestedRooms: ISuggestedRoom[]; @@ -33,7 +33,7 @@ index 6be226a172..dbb69d8f62 100644 DefaultTagID.DM, DefaultTagID.Untagged, DefaultTagID.Conference, -@@ -100,6 +102,7 @@ export const TAG_ORDER: TagID[] = [ +@@ -89,6 +91,7 @@ export const TAG_ORDER: TagID[] = [ // but we'd have to make sure that rooms you weren't in were hidden. ]; const ALWAYS_VISIBLE_TAGS: TagID[] = [DefaultTagID.DM, DefaultTagID.Untagged]; @@ -41,7 +41,7 @@ index 6be226a172..dbb69d8f62 100644 interface ITagAesthetics { sectionLabel: TranslationKey; -@@ -377,6 +380,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { +@@ -366,6 +369,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { return null; }; @@ -59,7 +59,7 @@ index 6be226a172..dbb69d8f62 100644 const TAG_AESTHETICS: TagAestheticsMap = { [DefaultTagID.Invite]: { sectionLabel: _td("action|invites_list"), -@@ -394,6 +408,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -383,6 +397,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { defaultHidden: false, AuxButtonComponent: DmAuxButton, }, @@ -72,15 +72,15 @@ index 6be226a172..dbb69d8f62 100644 [DefaultTagID.Conference]: { sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"), isInvite: false, -@@ -432,6 +452,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -421,6 +441,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { - export default class LegacyRoomList extends React.PureComponent { + export default class RoomList extends React.PureComponent { private dispatcherRef?: string; + private readonly unifiedRoomListWatcherRef: string; private treeRef = createRef(); public static contextType = MatrixClientContext; -@@ -443,7 +464,14 @@ export default class LegacyRoomList extends React.PureComponent +@@ -432,7 +453,14 @@ export default class RoomList extends React.PureComponent { this.state = { sublists: {}, suggestedRooms: SpaceStore.instance.suggestedRooms, @@ -95,17 +95,13 @@ index 6be226a172..dbb69d8f62 100644 } public componentDidMount(): void { -@@ -459,6 +487,7 @@ export default class LegacyRoomList extends React.PureComponent +@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent { SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms); RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); defaultDispatcher.unregister(this.dispatcherRef); + SettingsStore.unwatchSetting(this.unifiedRoomListWatcherRef); SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate); - LegacyCallHandler.instance.off(LegacyCallHandlerEvent.ProtocolSupport, this.updateProtocolSupport); } -@@ -467,6 +496,12 @@ export default class LegacyRoomList extends React.PureComponent - this.updateLists(); - }; + private onUnifiedRoomListChange = (): void => { + this.setState({ @@ -116,7 +112,7 @@ index 6be226a172..dbb69d8f62 100644 private onRoomViewStoreUpdate = (): void => { this.setState({ currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined, -@@ -605,7 +640,9 @@ export default class LegacyRoomList extends React.PureComponent +@@ -590,7 +625,9 @@ export default class RoomList extends React.PureComponent { const aesthetics = TAG_AESTHETICS[orderedTagId]; if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`); @@ -128,13 +124,13 @@ 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 aee9141c29..7eda4d794b 100644 +index 1c27f03e88..ae4b0ea644 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -358,6 +358,14 @@ export type BooleanSettingKey = Assignable> | Fe - export type StringSettingKey = Assignable>; +@@ -192,6 +192,14 @@ export interface IFeature extends Omit, "isFeature"> { + export type ISetting = IBaseSetting | IFeature; - export const SETTINGS: Settings = { + export const SETTINGS: { [setting: string]: ISetting } = { + // SC settings start + "unifiedRoomList": { + supportedLevels: LEVELS_ACCOUNT_SETTINGS, @@ -147,10 +143,10 @@ index aee9141c29..7eda4d794b 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index 6985e007bd..206ab20037 100644 +index 53377e0a01..381187b85c 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -504,6 +504,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements this.setAndPersistListOrder(tag, listOrder); } } @@ -160,7 +156,7 @@ index 6985e007bd..206ab20037 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -617,7 +620,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -613,7 +616,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -184,7 +180,7 @@ index 6985e007bd..206ab20037 100644 } diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 25d6b78fde..f3fc3899d0 100644 +index e296676149..06147137b3 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter { @@ -243,7 +239,7 @@ index 25d6b78fde..f3fc3899d0 100644 } } diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts -index 78823cbc42..00883e2ad6 100644 +index 50cecda665..8efc2d040d 100644 --- a/src/stores/room-list/models.ts +++ b/src/stores/room-list/models.ts @@ -13,6 +13,7 @@ export enum DefaultTagID { @@ -263,5 +259,5 @@ index 78823cbc42..00883e2ad6 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.49.0 +2.47.0 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 index 5503271..da6ddf3 100644 --- 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 1755079d1f53e5738ef9841607184d1bae0a05af Mon Sep 17 00:00:00 2001 +From 9fb400a94a190f910b731e3c5ea2c3ccdd91adce Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 17 Dec 2023 11:11:58 +0100 Subject: Don't sort muted rooms to bottom, I still want to see them. @@ -8,7 +8,7 @@ Subject: Don't sort muted rooms to bottom, I still want to see them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -index 0f95fe78c2..2de554c357 100644 +index 67ee1ca084..67dcaa3855 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts @@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm { @@ -21,5 +21,5 @@ index 0f95fe78c2..2de554c357 100644 /** -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index aa3a05d..b62a38a 100644 --- 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 db11438720e8798855e72dbe2c41223d7d565d50 Mon Sep 17 00:00:00 2001 +From 96de5eb0667f130de17544eb104647f823b617b0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -8,10 +8,10 @@ Subject: Don't preview reactions 1 file changed, 2 insertions(+) diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts -index 51e413940d..7775d1e52a 100644 +index e0e06ec980..7ee27f8402 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts -@@ -63,10 +63,12 @@ const PREVIEWS: Record< +@@ -57,10 +57,12 @@ const PREVIEWS: Record< isState: false, previewer: new StickerEventPreview(), }, @@ -25,5 +25,5 @@ index 51e413940d..7775d1e52a 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.49.0 +2.47.0 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 index dfe3d46..0a34a68 100644 --- 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 28c8aafc65b222ddb7e663379b9981f005e77ef0 Mon Sep 17 00:00:00 2001 +From cc3db444dc3788e6eaca8db3bd77feccc0e2133d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 17 Nov 2021 12:50:25 +0100 Subject: Hide the "mute" notification state the same way as the other states @@ -11,10 +11,10 @@ way. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx -index 3eafb671cb..c9dcd00fd0 100644 +index 8351c176ff..a12fb141b9 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx -@@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent { +@@ -305,7 +305,9 @@ export class RoomTile extends React.PureComponent { // Only show the icon by default if the room is overridden to muted. // TODO: [FTUE Notifications] Probably need to detect global mute state @@ -26,5 +26,5 @@ index 3eafb671cb..c9dcd00fd0 100644 return ( -- -2.49.0 +2.47.0 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 index 86e1d45..8d1e7b4 100644 --- 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 5042b0693d8f0d5b722ae40169855a28364f95a2 Mon Sep 17 00:00:00 2001 +From 5b5635a2c649226fccdd47013c576a8e1789af4e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 18:58:32 +0200 Subject: Allow muted rooms to render as unread @@ -8,18 +8,18 @@ Subject: Allow muted rooms to render as unread 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts -index d5254d523d..9cb1e24d1d 100644 +index 7c281d0d2d..f06be85437 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -255,7 +255,7 @@ export function determineUnreadState( - return { symbol: "!", count: 1, level: NotificationLevel.Highlight, invited: false }; + return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; } - if (getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { + if (false && getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { - return { symbol: null, count: 0, level: NotificationLevel.None, invited: false }; + return { symbol: null, count: 0, level: NotificationLevel.None }; } -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index ec5ec8f..078ebf2 100644 --- 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 f96924008d456dadd8d56a2bb6756a1afbd96431 Mon Sep 17 00:00:00 2001 +From 532251811dbd3c3ff6ae43050acd6fb5140e20a0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -8,7 +8,7 @@ Subject: Increase default visible tiles 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index a4468dfffe..a4ae9bbc1d 100644 +index ff60309e08..275b6d330b 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -74,7 +74,7 @@ export class ListLayout { @@ -21,5 +21,5 @@ index a4468dfffe..a4ae9bbc1d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.49.0 +2.47.0 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 index 353c845..39f838a 100644 --- 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 d52e8bb4d370dd0ba42a94e20dfc7f900a33f508 Mon Sep 17 00:00:00 2001 +From 920a48f9ec942635cd6a877f366e6c38abad9b11 Mon Sep 17 00:00:00 2001 From: su-ex 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 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 7eda4d794b..b6cde99d81 100644 +index ae4b0ea644..12d9965cf1 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -365,6 +365,11 @@ export const SETTINGS: Settings = { +@@ -199,6 +199,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, @@ -28,12 +28,12 @@ index 7eda4d794b..b6cde99d81 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 690beaa0b7..fcd7ff659b 100644 +index 90358f3310..60df05478a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + /** Whether the feature flag is set for MSC3946 */ private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors"); - private _storeReadyDeferred = defer(); + // SC start + private _showSpaceDMBadges = true; @@ -49,7 +49,7 @@ index 690beaa0b7..fcd7ff659b 100644 SettingsStore.monitorSetting("Spaces.allRoomsInHome", null); SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null); SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null); -@@ -215,6 +223,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -192,6 +200,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { return this._allRoomsInHome; } @@ -60,7 +60,7 @@ index 690beaa0b7..fcd7ff659b 100644 public setActiveRoomInSpace(space: SpaceKey): void { if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return; if (space !== this.activeSpace) this.setActiveSpace(space, false); -@@ -724,6 +736,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -701,6 +713,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false; @@ -71,7 +71,7 @@ index 690beaa0b7..fcd7ff659b 100644 if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { return s === dmBadgeSpace; } -@@ -1301,6 +1317,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -1277,6 +1293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { break; } @@ -86,7 +86,7 @@ index 690beaa0b7..fcd7ff659b 100644 + case "Spaces.enabledMetaSpaces": { const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); - const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]); + const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.49.0 +2.47.0 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 index 603877b..c7d56cf 100644 --- 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 2a5b9f5f25b4b5fdfb60c21b4edcd9dd20dbda5d Mon Sep 17 00:00:00 2001 +From 8f81368ec09b41f996955b8a8fabcc594c194194 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:32:42 +0200 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream @@ -66,24 +66,23 @@ Date: Tue Aug 17 11:29:22 2021 +0200 Signed-off-by: Tadeusz SoĊ›nierz --- - src/components/views/emojipicker/EmojiPicker.tsx | 16 ++++++++++++++++ - .../views/emojipicker/ReactionPicker.tsx | 1 + - 2 files changed, 17 insertions(+) + src/components/views/emojipicker/EmojiPicker.tsx | 15 +++++++++++++++ + .../views/emojipicker/ReactionPicker.tsx | 1 + + 2 files changed, 16 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index 71659d579b..4acbfd1fcb 100644 +index 4806ad4216..7d4a4353e2 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 { type ButtonEvent } from "../elements/AccessibleButton"; - +@@ -17,6 +17,7 @@ import Header from "./Header"; + import Search from "./Search"; + import Preview from "./Preview"; + import QuickReactions from "./QuickReactions"; +import AccessibleButton from '../elements/AccessibleButton'; -+ - export const CATEGORY_HEADER_HEIGHT = 20; - export const EMOJI_HEIGHT = 35; - export const EMOJIS_PER_ROW = 8; -@@ -36,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; + import Category, { CategoryKey, ICategory } from "./Category"; + import { filterBoolean } from "../../../utils/arrays"; + import { +@@ -37,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; const ZERO_WIDTH_JOINER = "\u200D"; interface IProps { @@ -91,7 +90,7 @@ index 71659d579b..4acbfd1fcb 100644 selectedEmojis?: Set; onChoose(unicode: string): boolean; onFinished(): void; -@@ -337,6 +340,10 @@ class EmojiPicker extends React.Component { +@@ -341,6 +343,10 @@ class EmojiPicker extends React.Component { } }; @@ -102,7 +101,7 @@ index 71659d579b..4acbfd1fcb 100644 private static categoryHeightForEmojiCount(count: number): number { if (count === 0) { return 0; -@@ -392,6 +399,15 @@ class EmojiPicker extends React.Component { +@@ -396,6 +402,15 @@ class EmojiPicker extends React.Component { return categoryElement; })} @@ -119,7 +118,7 @@ index 71659d579b..4acbfd1fcb 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 11b3d9468a..7d369945fe 100644 +index b62df99e25..8291a38dc9 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -126,6 +126,7 @@ class ReactionPicker extends React.Component { @@ -131,5 +130,5 @@ index 11b3d9468a..7d369945fe 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.49.0 +2.47.0 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 index 36baeb9..50c2486 100644 --- 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 eae491a0a6a3f8bfa47785e21467ca56d50dd437 Mon Sep 17 00:00:00 2001 +From 4980c7e816e83a3dce4106c8485461044591da26 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space @@ -8,7 +8,7 @@ Subject: Allow reactions to take more space 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss -index 917bcfbb84..75ec572c9e 100644 +index dd9d7ddb47..9ebe95021e 100644 --- a/res/css/views/messages/_ReactionsRowButton.pcss +++ b/res/css/views/messages/_ReactionsRowButton.pcss @@ -14,6 +14,7 @@ Please see LICENSE files in the repository root for full details. @@ -28,5 +28,5 @@ index 917bcfbb84..75ec572c9e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.49.0 +2.47.0 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 index f0d7519..5e01a14 100644 --- 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 0e919ce4854c5f66870f4465b8e1c4b793960025 Mon Sep 17 00:00:00 2001 +From b29702cd66f838ebe6af90fbf0b223caab3725b1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 May 2024 14:35:16 +0200 Subject: On space switch don't automatically show last opened room @@ -10,7 +10,7 @@ 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 0f722ae53d..47f09400d7 100644 +index 80a648b5d5..f917d0bf7f 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -1456,7 +1456,15 @@ export default class MatrixChat extends React.PureComponent { @@ -46,10 +46,10 @@ index 0f722ae53d..47f09400d7 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index b6cde99d81..61a17d09ae 100644 +index 12d9965cf1..3e9fb95799 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -370,6 +370,12 @@ export const SETTINGS: Settings = { +@@ -204,6 +204,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -63,10 +63,10 @@ index b6cde99d81..61a17d09ae 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index fcd7ff659b..33407f74e8 100644 +index 60df05478a..0be7ba190a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -288,6 +288,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { // else if the last viewed room in this space is joined then view that // else view space home or home depending on what is being clicked on if ( @@ -75,5 +75,5 @@ index fcd7ff659b..33407f74e8 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index e435081..3ca9572 100644 --- 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 27ba28c7b3840b5b458bd98599183728e681c885 Mon Sep 17 00:00:00 2001 +From 7d9fafb12e3bf1768e32b39ecf00b973309e6c1b Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 9859f24015..957b54286c 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts @@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { @@ -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.47.0 diff --git a/patches/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch index bbe4996..892ae33 100644 --- 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 2611dc55c8c915f19ad3b06c3d406101bce24b67 Mon Sep 17 00:00:00 2001 +From 9a1518e041fa2d5364885725b259378952a2b445 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -8,7 +8,7 @@ Subject: Stop the search bar wobble 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index 75180013f6..e55eadaaf7 100644 +index 15ba02b6b8..f9bcd695ca 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { @@ -20,5 +20,5 @@ index 75180013f6..e55eadaaf7 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch index cd39903..3aa327b 100644 --- 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 453eae3dc1a21fd18c28dca91498efbbadfb4e50 Mon Sep 17 00:00:00 2001 +From e5b9cc85889d539da3d4acff20cf8b3199ae94e3 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides @@ -8,7 +8,7 @@ Subject: Import SC compound theme overrides 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index e55eadaaf7..21d0f1d83a 100644 +index f9bcd695ca..ad7c298820 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -11,6 +11,7 @@ Please see LICENSE files in the repository root for full details. @@ -20,5 +20,5 @@ index e55eadaaf7..21d0f1d83a 100644 @import "./_animations.pcss"; @import "./_spacing.pcss"; -- -2.49.0 +2.47.0 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 index 05540d9..16407d0 100644 --- 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 f1cac8ba3ffcd3cc0b7ab6d014d6e40d8dec4451 Mon Sep 17 00:00:00 2001 +From 124ee073c6de89d111823c94922d7d2eeb596a0b Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 7 Sep 2021 19:41:52 +0200 Subject: No damn avatar background in room list @@ -8,7 +8,7 @@ Subject: No damn avatar background in room list 1 file changed, 3 insertions(+) diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx -index f3a44521fa..396601ba6e 100644 +index 32c75a936e..f420bdbc7b 100644 --- a/src/components/structures/BackdropPanel.tsx +++ b/src/components/structures/BackdropPanel.tsx @@ -13,6 +13,9 @@ interface IProps { @@ -22,5 +22,5 @@ index f3a44521fa..396601ba6e 100644 const styles: CSSProperties = {}; -- -2.49.0 +2.47.0 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 index 6a28b49..1891179 100644 --- 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 c5ae977ed90c680d9055460295f60f4945f0c98a Mon Sep 17 00:00:00 2001 +From ca4fa33dda5812b259c4391171358a50beb812fd Mon Sep 17 00:00:00 2001 From: su-ex 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 7baa127f16..4da70f5ecb 100644 +index 22da73bef7..455a57e33d 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx -@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component +@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component return false; } @@ -25,5 +25,5 @@ index 7baa127f16..4da70f5ecb 100644 } -- -2.49.0 +2.47.0 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 index fad7eab..e6223c2 100644 --- 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 efe6a8611871296b277adbf5201fec0826b837fe Mon Sep 17 00:00:00 2001 +From 45fea7a503d58e70e876bf5c94e5731fbed85551 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:26:16 +0200 Subject: Always apply corner radius to all edges of the bubble @@ -8,7 +8,7 @@ Subject: Always apply corner radius to all edges of the bubble 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss -index c25cbfcec4..682ea64890 100644 +index 3a42cde9bb..a5f5480010 100644 --- a/res/css/views/rooms/_EventBubbleTile.pcss +++ b/res/css/views/rooms/_EventBubbleTile.pcss @@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details. @@ -20,7 +20,7 @@ index c25cbfcec4..682ea64890 100644 /* the selector here is quite weird because timestamps can appear linked & unlinked and in different places */ /* in the DOM depending on the specific rendering context */ -@@ -376,7 +378,7 @@ Please see LICENSE files in the repository root for full details. +@@ -377,7 +379,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_EventTile_continuation[data-self="false"] .mx_EventTile_line { @@ -29,7 +29,7 @@ index c25cbfcec4..682ea64890 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -384,7 +386,7 @@ Please see LICENSE files in the repository root for full details. +@@ -385,7 +387,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { @@ -38,7 +38,7 @@ index c25cbfcec4..682ea64890 100644 } } &.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line { -@@ -401,7 +403,7 @@ Please see LICENSE files in the repository root for full details. +@@ -402,7 +404,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_EventTile_continuation[data-self="true"] .mx_EventTile_line { @@ -47,7 +47,7 @@ index c25cbfcec4..682ea64890 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -409,7 +411,7 @@ Please see LICENSE files in the repository root for full details. +@@ -410,7 +412,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { @@ -57,5 +57,5 @@ index c25cbfcec4..682ea64890 100644 } &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch index f78680d..169fddd 100644 --- 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 4c1b8a37c564d086ef37049cf5b0c4ac6376e8a9 Mon Sep 17 00:00:00 2001 +From 61195cdcca6e390e179b776726bab89cc56e6fca Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 61a17d09ae..4ca441dc47 100644 +index 3e9fb95799..b76ec5feb2 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -795,7 +795,7 @@ export const SETTINGS: Settings = { +@@ -644,7 +644,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), @@ -21,5 +21,5 @@ index 61a17d09ae..4ca441dc47 100644 "userTimezone": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, -- -2.49.0 +2.47.0 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 index 620145e..9379040 100644 --- 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 9fcbc30485a80dcfa7321fa3599d16ce5e7308e6 Mon Sep 17 00:00:00 2001 +From 457d402a9f2d854efceb14cd6bd573db6c09175d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:40:51 +0200 Subject: Enable custom emote rendering by default @@ -8,18 +8,18 @@ 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 4ca441dc47..aa74245519 100644 +index b76ec5feb2..51404c88d4 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -650,7 +650,7 @@ export const SETTINGS: Settings = { +@@ -508,7 +508,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, - default: false, + default: true, }, - "feature_new_room_list": { - supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, + /** + * With the transition to Compound we are moving to a base font size -- -2.49.0 +2.47.0 diff --git a/patches/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch index 9d5b0d2..2d29b27 100644 --- 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 e84deb43f138f16131d67aa46c1d5a47e298e776 Mon Sep 17 00:00:00 2001 +From 9f640ce10fd0903be3c33e76ba1842112e659d5f Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default @@ -8,7 +8,7 @@ Subject: Enable chat previews by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index a4ae9bbc1d..227c918457 100644 +index 275b6d330b..3a188451e7 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -18,7 +18,7 @@ interface ISerializedListLayout { @@ -21,5 +21,5 @@ index a4ae9bbc1d..227c918457 100644 public constructor(public readonly tagId: TagID) { -- -2.49.0 +2.47.0 diff --git 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 deleted file mode 100644 index 59902b1..0000000 --- a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8354faea210da07d2948ca60dd6eaf3e7a668f86 Mon Sep 17 00:00:00 2001 -From: SpiritCroc -Date: Sat, 30 Nov 2024 19:42:44 +0100 -Subject: Disable showing people in spaces by default - ---- - src/settings/Settings.tsx | 2 +- - src/stores/room-list/filters/SpaceFilterCondition.ts | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index aa74245519..07227b02dc 100644 ---- a/src/settings/Settings.tsx -+++ b/src/settings/Settings.tsx -@@ -1233,7 +1233,7 @@ export const SETTINGS: Settings = { - }, - "Spaces.showPeopleInSpace": { - supportedLevels: [SettingLevel.ROOM_ACCOUNT], -- default: true, -+ default: false, - }, - "developerMode": { - displayName: _td("devtools|developer_mode"), -diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts -index 02e20e9103..2b49711c8e 100644 ---- a/src/stores/room-list/filters/SpaceFilterCondition.ts -+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts -@@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore"; - export class SpaceFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable { - private roomIds = new Set(); - private userIds = new Set(); -- private showPeopleInSpace = true; -+ private showPeopleInSpace = false; - private space: SpaceKey = MetaSpace.Home; - - public isVisible(room: Room): boolean { --- -2.49.0 - diff --git a/patches/element-web/0026-Fix-captions-in-bubble-layout.patch b/patches/element-web/0026-Fix-captions-in-bubble-layout.patch new file mode 100644 index 0000000..2e1da09 --- /dev/null +++ b/patches/element-web/0026-Fix-captions-in-bubble-layout.patch @@ -0,0 +1,26 @@ +From 7fb604f189e547daf72cd93ce53f8a76c733c321 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Thu, 31 Oct 2024 17:33:32 +0100 +Subject: Fix captions in bubble layout + +Image height of 100% combined with overflow-y: hidden was causing +caption to be invisible in bubble layout. +--- + res/css/views/rooms/_EventBubbleTile.pcss | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss +index a5f5480010..fbb1ad2e1b 100644 +--- a/res/css/views/rooms/_EventBubbleTile.pcss ++++ b/res/css/views/rooms/_EventBubbleTile.pcss +@@ -336,7 +336,6 @@ Please see LICENSE files in the repository root for full details. + + .mx_MImageBody { + width: 100%; +- height: 100%; + + .mx_MImageBody_thumbnail.mx_MImageBody_thumbnail--blurhash { + position: unset; +-- +2.47.0 + diff --git a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch similarity index 88% rename from patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch rename to patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch index 7be1af5..e28c368 100644 --- a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch @@ -1,28 +1,17 @@ -From 345e3cce61ff9afa68d8b17dde379fce269faa56 Mon Sep 17 00:00:00 2001 +From 18578fe4ac6838b2d70a4efb029a75ab24087dab Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 31 Oct 2024 13:44:20 -0400 Subject: Improve IRC layout for SchildiChat Signed-off-by: Suguru Hirahara - -Squashed: - -Author: Suguru Hirahara -Date: Thu Nov 28 10:01:43 2024 -0500 - - Improve IRC layout for SchildiChat: fix placement of capital letters inside read receipts - - This is a follow-up to 18578fe4ac6838b2d70a4efb029a75ab24087dab. - - Signed-off-by: Suguru Hirahara --- .../elements/_GenericEventListSummary.pcss | 15 ++ - res/css/views/rooms/_EventTile.pcss | 148 ++++++++++++++++-- + res/css/views/rooms/_EventTile.pcss | 146 ++++++++++++++++-- res/css/views/rooms/_IRCLayout.pcss | 2 + - 3 files changed, 155 insertions(+), 10 deletions(-) + 3 files changed, 153 insertions(+), 10 deletions(-) diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss -index f4aa0e6f0f..88bcb88f14 100644 +index c13f819439..4f42040606 100644 --- a/res/css/views/elements/_GenericEventListSummary.pcss +++ b/res/css/views/elements/_GenericEventListSummary.pcss @@ -1,5 +1,6 @@ @@ -31,7 +20,7 @@ index f4aa0e6f0f..88bcb88f14 100644 +Copyright 2024 Suguru Hirahara Copyright 2016 OpenMarket Ltd - SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial + SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only @@ -36,6 +37,20 @@ Please see LICENSE files in the repository root for full details. } } @@ -54,7 +43,7 @@ index f4aa0e6f0f..88bcb88f14 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index b4172fc003..c8538a6c32 100644 +index 311e059166..501a9210cf 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -64,7 +53,7 @@ index b4172fc003..c8538a6c32 100644 Copyright 2020, 2021 The Matrix.org Foundation C.I.C. Copyright 2015, 2016 OpenMarket Ltd -@@ -273,6 +274,10 @@ $left-gutter: 64px; +@@ -279,6 +280,10 @@ $left-gutter: 64px; align-items: flex-start; padding-top: 0; @@ -75,7 +64,7 @@ index b4172fc003..c8538a6c32 100644 > a { text-decoration: none; /* timestamps are links which shouldn't be underlined */ min-width: var(--MessageTimestamp-width); /* ensure space for EventTile without timestamp */ -@@ -280,6 +285,7 @@ $left-gutter: 64px; +@@ -286,6 +291,7 @@ $left-gutter: 64px; > * { margin-right: var(--right-padding); @@ -83,7 +72,7 @@ index b4172fc003..c8538a6c32 100644 } .mx_EventTile_avatar, -@@ -315,17 +321,46 @@ $left-gutter: 64px; +@@ -321,17 +327,46 @@ $left-gutter: 64px; width: var(--name-width); margin-inline-end: 0; /* override mx_EventTile > * */ @@ -131,7 +120,7 @@ index b4172fc003..c8538a6c32 100644 } &:hover { -@@ -337,17 +372,68 @@ $left-gutter: 64px; +@@ -343,17 +378,66 @@ $left-gutter: 64px; display: inline; background-color: $event-selected-color; border-radius: 8px 0 0 8px; @@ -154,7 +143,6 @@ index b4172fc003..c8538a6c32 100644 + .mx_BaseAvatar > * { + height: $font-14px !important; + width: $font-14px !important; -+ line-height: $font-14px; /* override wildcard; fix alignment of capital letter inside read receipts */ + flex-shrink: 0; /* Prevents the avatar from shrinking (when mx_DisambiguatedProfile_displayName is long) */ + } + @@ -165,7 +153,6 @@ index b4172fc003..c8538a6c32 100644 + .mx_BaseAvatar > * { + height: $font-16px !important; /* override the value specified above */ + width: $font-16px !important; /* override the value specified above */ -+ line-height: $font-16px; /* override wildcard; fix alignment of capital letter inside read receipts */ + } + } + @@ -202,7 +189,7 @@ index b4172fc003..c8538a6c32 100644 .mx_EventTile_e2eIcon { padding: 0; flex-grow: 0; -@@ -359,9 +445,8 @@ $left-gutter: 64px; +@@ -365,9 +449,8 @@ $left-gutter: 64px; .mx_TextualEvent, .mx_ViewSourceEvent, .mx_MTextBody { @@ -214,7 +201,7 @@ index b4172fc003..c8538a6c32 100644 } .mx_EventTile_e2eIcon, -@@ -399,8 +484,36 @@ $left-gutter: 64px; +@@ -405,8 +488,36 @@ $left-gutter: 64px; } } @@ -253,7 +240,7 @@ index b4172fc003..c8538a6c32 100644 } .mx_MessageTimestamp { -@@ -453,8 +566,14 @@ $left-gutter: 64px; +@@ -459,8 +570,14 @@ $left-gutter: 64px; &.mx_EventTile_emote { .mx_EventTile_avatar { @@ -270,7 +257,7 @@ index b4172fc003..c8538a6c32 100644 } } -@@ -636,6 +755,15 @@ $left-gutter: 64px; +@@ -642,6 +759,15 @@ $left-gutter: 64px; var(--name-width) + var(--icon-width) + var(--MessageTimestamp-width) + 2 * var(--right-padding) ); } @@ -287,7 +274,7 @@ index b4172fc003..c8538a6c32 100644 &[data-layout="group"] { diff --git a/res/css/views/rooms/_IRCLayout.pcss b/res/css/views/rooms/_IRCLayout.pcss -index 953a0c941f..3326d0c0ff 100644 +index ecf1c25716..de85238ca6 100644 --- a/res/css/views/rooms/_IRCLayout.pcss +++ b/res/css/views/rooms/_IRCLayout.pcss @@ -1,5 +1,6 @@ @@ -296,7 +283,7 @@ index 953a0c941f..3326d0c0ff 100644 +Copyright 2024 Suguru Hirahara Copyright 2020 The Matrix.org Foundation C.I.C. - SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial + SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only @@ -15,6 +16,7 @@ Please see LICENSE files in the repository root for full details. --icon-width: 14px; --line-height: var(--irc-line-height); @@ -306,5 +293,5 @@ index 953a0c941f..3326d0c0ff 100644 line-height: var(--line-height) !important; -- -2.49.0 +2.47.0