Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/text-editor-improvements-5
Adorian Dorand65baf013a7d
diff --cc apps/client/src/widgets/type_widgets/text/EditableText.tsxindex d9f71b2db2,ec9a42530b..34c72fd658--- a/apps/client/src/widgets/type_widgets/text/EditableText.tsx+++ b/apps/client/src/widgets/type_widgets/text/EditableText.tsx@@@ -35,10 -35,9 +35,10 @@@ import} from "../../react/hooks";import IconPicker from "../../react/IconPicker";import { setEditorNoteId } from "../../react/NoteStore";+import { convertImageToDrawing } from "../canvas/image_to_drawing";import { TypeWidgetProps } from "../type_widget";import AttachmentSaves, { useNoteEditor } from "./attachment_saves";- import CKEditorWithWatchdog, { CKEditorApi, NotificationEventData, NotificationEventInfo } from "./CKEditorWithWatchdog";+ import CKEditor, { CKEditorApi, NotificationEventData, NotificationEventInfo } from "./CKEditor";import { getContentEmbedTools } from "./content_embed_tools";import { useEmbedEditors } from "./editable_embed";import getTemplates, { updateTemplateCache } from "./snippets.js";