Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-17 02:30:42 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/share_theme

Browse Source 
; Conflicts:
;	pnpm-lock.yaml
This commit is contained in:
Elian Doran
2025-06-10 08:58:20 +03:00
parent 8ee6c7114c 23238a6ca0
commit 9d347ecf74
12 changed files with 426 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/type_widgets/ckeditor/config.ts
View File

@@ -246,7 +246,7 @@ export function buildFloatingToolbar() {
{
label: "Insert",
icon: "plus",
items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
items: ["link", "bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
},
"|",
"outdent",