Skip to content

Build your personal knowledge base with Trilium Notes

Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/text-editor-table-improvements

Adorian Doran4c7ff642d76a
diff --cc apps/client/src/translations/en/translation.json
index 3b7e09f0b0,b819c6dcea..f8863d3907
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@@ -4363,15 -4347,8 +4360,17 @@@
"flip-horizontally": "Flip horizontally",
"flip-vertically": "Flip vertically",
"change-icon": "Change icon",
+ "move-row-up": "Move row up",
+ "move-row-down": "Move row down",
+ "move-column-left": "Move column left",
+ "move-column-right": "Move column right",
+ "insert-table": "Insert table…",
+ "rows": "Rows",
+ "columns": "Columns",
+ "enter-a-whole-number-between-1-and-0": "Enter a whole number between 1 and %0.",
- "the-table-is-too-large-max-0-cells": "The table is too large (max %0 cells)."
++ "the-table-is-too-large-max-0-cells": "The table is too large (max %0 cells).",
+ "math": "Math",
+ "date-time": "Date/time"
},
"task-state-dropped-title": "Invalid task states",
"task-state-dropped-message_one": "A custom task state definition is invalid and was ignored.",
diff --cc packages/ckeditor5/src/plugins.ts
index 4d1c68533b,15819d469d..f19d83a5d4
--- a/packages/ckeditor5/src/plugins.ts
+++ b/packages/ckeditor5/src/plugins.ts
@@@ -57,9 -57,7 +57,10 @@@ import TodoListMultistate from "./plugi
import TodoListUncheckOnEnter from "./plugins/todo_list_uncheck_on_enter.js";
import CollapsibleListItems from "./plugins/collapsible_list_items.js";
import TableIndent from "./plugins/table_indent.js";
+import TableContextMenu from "./plugins/table_context_menu.js";
+import TableMove from "./plugins/table_move/table_move.js";
+import TableInsertUI from "./plugins/table_insert/table_insert_ui.js";
+ import ToolbarGroupMenu from "./plugins/toolbar_group_menu.js";
/**
* Plugins that are specific to Trilium and not part of the CKEditor 5 core, included in both text editors but not in the attribute editor.
@@@ -95,9 -93,7 +96,10 @@@ const TRILIUM_PLUGINS: typeof Plugin[]
TodoListMultistate,
CollapsibleListItems,
TableIndent,
+ TableContextMenu,
+ TableMove,
+ TableInsertUI,
+ ToolbarGroupMenu,
CopyAnchorLinkButton,
CopyLinkUrlButton,
ImageActions,