mirror of
https://github.com/zadam/trilium.git
synced 2025-11-18 03:00:41 +01:00
Merge remote-tracking branch 'origin/main' into react/type_widgets
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
"ckeditor5-premium-features": "46.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@smithy/middleware-retry": "4.2.4",
|
||||
"@smithy/middleware-retry": "4.3.0",
|
||||
"@types/jquery": "3.5.33"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
"@codemirror/lang-xml": "6.1.0",
|
||||
"@codemirror/legacy-modes": "6.5.1",
|
||||
"@codemirror/search": "6.5.11",
|
||||
"@codemirror/view": "6.38.2",
|
||||
"@codemirror/view": "6.38.3",
|
||||
"@fsegurai/codemirror-theme-abcdef": "6.2.2",
|
||||
"@fsegurai/codemirror-theme-abyss": "6.2.2",
|
||||
"@fsegurai/codemirror-theme-android-studio": "6.2.2",
|
||||
@@ -50,6 +50,6 @@
|
||||
"codemirror-lang-elixir": "4.0.0",
|
||||
"codemirror-lang-hcl": "0.1.0",
|
||||
"codemirror-lang-mermaid": "0.5.0",
|
||||
"eslint-linter-browserify": "9.35.0"
|
||||
"eslint-linter-browserify": "9.36.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@triliumnext/commons",
|
||||
"version": "0.98.1",
|
||||
"version": "0.99.0",
|
||||
"description": "Shared library between the clients (e.g. browser, Electron) and the server, mostly for type definitions and utility methods.",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
|
||||
@@ -100,6 +100,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
|
||||
codeNoteTheme: string;
|
||||
|
||||
initialized: boolean;
|
||||
databaseReadonly: boolean;
|
||||
isPasswordSet: boolean;
|
||||
overrideThemeFonts: boolean;
|
||||
spellCheckEnabled: boolean;
|
||||
@@ -127,6 +128,8 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
|
||||
textNoteEmojiCompletionEnabled: boolean;
|
||||
/** Whether keyboard auto-completion for notes is triggered when typing `@` in text notes (attribute editing is not affected). */
|
||||
textNoteCompletionEnabled: boolean;
|
||||
/** Whether keyboard auto-completion for editing commands is triggered when typing `/`. */
|
||||
textNoteSlashCommandsEnabled: boolean;
|
||||
backgroundEffects: boolean;
|
||||
|
||||
// Share settings
|
||||
@@ -136,6 +139,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
|
||||
// AI/LLM integration options
|
||||
aiEnabled: boolean;
|
||||
aiProvider: string;
|
||||
aiProviderPrecedence: string; // TODO: Is this still supported?
|
||||
aiSystemPrompt: string;
|
||||
aiTemperature: string;
|
||||
openaiApiKey: string;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
:root {
|
||||
--ck-content-font-family: inherit;
|
||||
--ck-content-font-size: inherit;
|
||||
--ck-content-font-color: inherit;
|
||||
--ck-content-line-height: inherit;
|
||||
--ck-content-font-family: inherit !important;
|
||||
--ck-content-font-size: inherit !important;
|
||||
--ck-content-font-color: inherit !important;
|
||||
--ck-content-line-height: inherit !important;
|
||||
}
|
||||
|
||||
.ck-content code,
|
||||
|
||||
Reference in New Issue
Block a user