Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-15 02:47:05 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/main' into feature/vibrancy

Browse Source
This commit is contained in:
Elian Doran
2026-01-30 18:45:30 +02:00
parent 5d5947f676 13de9975e3
commit f9803a4694
50 changed files with 1381 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/src/services/window.ts
View File

@@ -4,6 +4,7 @@ import { t } from "i18next";
import path from "path";
import url from "url";
import app_info from "./app_info.js";
import cls from "./cls.js";
import keyboardActionsService from "./keyboard_actions.js";
import log from "./log.js";
@@ -291,6 +292,9 @@ function getIcon() {
if (process.env.NODE_ENV === "development") {
return path.join(__dirname, "../../../desktop/electron-forge/app-icon/png/256x256-dev.png");
}
if (app_info.appVersion.includes("test")) {
return path.join(RESOURCE_DIR, "../public/assets/icon-dev.png");
}
return path.join(RESOURCE_DIR, "../public/assets/icon.png");
}