Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 03:46:37 +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

5
src/routes/api/options.js
View File

@@ -62,7 +62,10 @@ const ALLOWED_OPTIONS = new Set([
'minTocHeadings',
'checkForUpdates',
'disableTray',
'eraseUnusedImageAttachmentsAfterSeconds'
'eraseUnusedImageAttachmentsAfterSeconds',
'disableTray',
'customSearchEngineName',
'customSearchEngineUrl',
]);
function getOptions() {