Merge remote changes - resolve conflicts: keep remote package.json v1.4.0, keep local self-updater.js logic, features.js regenerated by build

This commit is contained in:
Krystie committed 2026-05-14 21:08:20 -07:00
commit 22c48076c0
32 files changed
+1749 -316

No files matched your search

+2 -1
View File
@@ -335,7 +335,8 @@
const res = await fetch('/api/v1/system/version');
const data = await res.json();
if (data.success) {
dcVersionInfo.textContent = 'v' + data.version + (data.commit ? ' (' + data.commit.substring(0, 7) + ')' : '');
const commit = data.commit && data.commit !== 'unknown' ? data.commit : null;
dcVersionInfo.textContent = 'v' + data.version + (commit ? ' (' + commit.substring(0, 7) + ')' : '');
}
} catch (_) {
dcVersionInfo.textContent = 'Unable to fetch version';