Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/extend-kept-html-tags

Browse Source 
; Conflicts:
;	src/routes/api/options.ts
;	src/services/options_init.ts
This commit is contained in:
Elian Doran
2024-11-28 21:56:08 +02:00
parent cc98a16246 b28a377b5f
commit aa99efc362
102 changed files with 2525 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/api/options.ts
View File

@@ -67,7 +67,8 @@ const ALLOWED_OPTIONS = new Set([
'locale',
'firstDayOfWeek',
'textNoteEditorType',
'allowedHtmlTags', // Allow configuring HTML import tags
'layoutOrientation',
'allowedHtmlTags' // Allow configuring HTML import tags
]);
function getOptions() {