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

1
src/services/options_init.ts
View File

@@ -137,6 +137,7 @@ const defaultOptions: DefaultOption[] = [
{ name: "textNoteEditorType", value: "ckeditor-balloon", isSynced: true },
// HTML import configuration
{ name: "layoutOrientation", value: "vertical", isSynced: false },
{ name: "allowedHtmlTags", value: JSON.stringify([
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol',
'li', 'b', 'i', 'strong', 'em', 'strike', 's', 'del', 'abbr', 'code', 'hr', 'br', 'div',