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

Merge remote-tracking branch 'origin/master' into next60

Browse Source 
# Conflicts:
#	src/routes/api/options.js
#	src/services/import/zip.js
#	src/services/options_init.js
This commit is contained in:
zadam
2023-05-07 09:41:33 +02:00
parent 2aa987c072 fbea3ed94f
commit cc02546ed3
7 changed files with 123 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/options_init.js
View File

@@ -89,6 +89,8 @@ const defaultOptions = [
{ name: 'checkForUpdates', value: 'true', isSynced: true },
{ name: 'disableTray', value: 'false', isSynced: false },
{ name: 'eraseUnusedImageAttachmentsAfterSeconds', value: '86400', isSynced: false },
{ name: 'customSearchEngineName', value: 'Duckduckgo', isSynced: false },
{ name: 'customSearchEngineUrl', value: 'https://duckduckgo.com/?q={keyword}', isSynced: false },
];
function initStartupOptions() {