1024x2/vexcord
1
0
Fork 0
mirror of https://git.1024x2.xyz/1024x2/vexcord.git synced 2025-10-31 10:04:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak toolbox icon, make Updater not show local changes as updates

Browse Source
This commit is contained in:
1024x2
2024-03-09 08:06:17 +00:00
parent 70b4e1c535
commit 63fa34a1c2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
0002-Small-rebrand.patch
View File

File diff suppressed because one or more lines are too long

2
0003-Experiments-Re-add-staging-banner.patch
View File

@@ -1,4 +1,4 @@
From 0c5477d6f5444c20ff901683fccd78e26d7a1542 Mon Sep 17 00:00:00 2001
From 0ea72960030d81dda7b2d8b90c52c3e47b4c561d Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Thu, 26 Oct 2023 00:48:25 +0100
Subject: [PATCH 3/5] Experiments: Re-add staging banner

8
0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
View File

@@ -1,6 +1,6 @@
From 00aba2082b64d8f01ea796f1118030bd944ebcc6 Mon Sep 17 00:00:00 2001
From ef30d1ed8a99d97556a31b5bb2e9d0f6019bb49a Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Wed, 11 Oct 2023 15:55:03 +0100
Date: Sat, 9 Mar 2024 08:00:55 +0000
Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
---
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 20a5d70..21f33d1 100644
index 20a5d70..c530e67 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -49,12 +49,7 @@ async function getRepo() {
@@ -21,7 +21,7 @@ index 20a5d70..21f33d1 100644
- if (!existsOnOrigin) return [];
-
- const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
+ const res = await git("log", "HEAD...@{u}", "--pretty=format:%an/%h/%s");
+ const res = await git("log", "HEAD..@{u}", "--pretty=format:%an/%h/%s");
const commits = res.stdout.trim();
return commits ? commits.split("\n").map(line => {

2
0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
View File

@@ -1,4 +1,4 @@
From e59ce67472e747ae336eae0591ec3869f1d1002b Mon Sep 17 00:00:00 2001
From 4eeba2e6c80371b433e9f0d741c21d6e79fd5fb8 Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Wed, 27 Dec 2023 15:05:44 +0000
Subject: [PATCH 5/5] Enable CSP bypass on stock discord desktop client