diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png index 6f32f76ec..1b1834ba1 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png index 1b1834ba1..a395a969b 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png deleted file mode 100644 index ccef8f7aa..000000000 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png and /dev/null differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.html index 27e27dddb..3b5c25ce6 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.html @@ -1,36 +1,30 @@

The SQL Console is Trilium's built-in database editor.

-

It can be accessed by going to the global menu → +

It can be accessed by going to the Global menu → Advanced → Open SQL Console.

Interaction

+
+ +

Saved SQL console

SQL queries or commands can be saved into a dedicated note.

To do so, simply write the query and press the - button. Once saved, the note will appear in Day Notes.

+ button. Once saved, the note will appear in Day Notes.

\ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote.html index e5a8231ba..3efd53a8f 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote.html @@ -27,31 +27,28 @@

However, we do not guarantee that all of your formatting will be imported 100% correctly.

Limitations

Internal links

The importer cannot transform Evernote internal links into Trilium internal diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html index cbf57c6ca..7b3a54250 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html @@ -7,21 +7,20 @@

The server installation includes both web and mobile frontends.

Configuration

diff --git a/docs/Developer Guide/Developer Guide/Documentation.md b/docs/Developer Guide/Developer Guide/Documentation.md index 4277ea4b9..35f406a73 100644 --- a/docs/Developer Guide/Developer Guide/Documentation.md +++ b/docs/Developer Guide/Developer Guide/Documentation.md @@ -1,5 +1,5 @@ # Documentation -There are multiple types of documentation for Trilium: +There are multiple types of documentation for Trilium: * The _User Guide_ represents the user-facing documentation. This documentation can be browsed by users directly from within Trilium, by pressing F1. * The _Developer's Guide_ represents a set of Markdown documents that present the internals of Trilium, for developers. diff --git a/docs/Release Notes/Release Notes/v0.101.2.md b/docs/Release Notes/Release Notes/v0.101.2.md index 6942b2e8e..842f42c29 100644 --- a/docs/Release Notes/Release Notes/v0.101.2.md +++ b/docs/Release Notes/Release Notes/v0.101.2.md @@ -18,5 +18,5 @@ * [Max content width is not respected when switching between note types in the same tab](https://github.com/TriliumNext/Trilium/issues/8065) * [Crash When a Note Includes Itself](https://github.com/TriliumNext/Trilium/issues/8294) * [Severe Performance Degradation and Crash Issues Due to Recursive Inclusion in Included Notes](https://github.com/TriliumNext/Trilium/issues/8017) -* [ is not a launcher even though it's in the launcher subtree](https://github.com/TriliumNext/Trilium/issues/8218) +* [is not a launcher even though it's in the launcher subtree](https://github.com/TriliumNext/Trilium/issues/8218) * [Archived subnotes of direct children appear in grid view without #includeArchived](https://github.com/TriliumNext/Trilium/issues/8184) \ No newline at end of file diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index b7675da99..f7800ca55 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -6172,17 +6172,31 @@ { "type": "relation", "name": "internalLink", - "value": "dj3j8dG4th4l", + "value": "Gr6xFaF6ioJ5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "wy8So3yZZlH9", + "value": "WOcw2SLH6tbX", "isInheritable": false, "position": 20 }, + { + "type": "relation", + "name": "internalLink", + "value": "wy8So3yZZlH9", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "dj3j8dG4th4l", + "isInheritable": false, + "position": 40 + }, { "type": "label", "name": "shareAlias", @@ -6196,20 +6210,6 @@ "value": "bx bx-window-open", "isInheritable": false, "position": 30 - }, - { - "type": "relation", - "name": "internalLink", - "value": "Gr6xFaF6ioJ5", - "isInheritable": false, - "position": 40 - }, - { - "type": "relation", - "name": "internalLink", - "value": "WOcw2SLH6tbX", - "isInheritable": false, - "position": 50 } ], "format": "markdown", @@ -14200,20 +14200,6 @@ "type": "text", "mime": "text/html", "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "Vc8PjrjAGuOp", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "internalLink", - "value": "l0tKav7yLHGF", - "isInheritable": false, - "position": 20 - }, { "type": "label", "name": "iconClass", @@ -14227,6 +14213,20 @@ "value": "sql-console", "isInheritable": false, "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "l0tKav7yLHGF", + "isInheritable": false, + "position": 50 + }, + { + "type": "relation", + "name": "internalLink", + "value": "x3i7MxGccDuM", + "isInheritable": false, + "position": 60 } ], "format": "markdown", @@ -14240,29 +14240,21 @@ "position": 10, "dataFileName": "SQL Console_image.png" }, - { - "attachmentId": "827EgLgWhZWF", - "title": "image.png", - "role": "image", - "mime": "image/jpg", - "position": 10, - "dataFileName": "1_SQL Console_image.png" - }, { "attachmentId": "gIbK7NNLu3iZ", "title": "image.png", "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "2_SQL Console_image.png" + "dataFileName": "1_SQL Console_image.png" }, { - "attachmentId": "pP87PB9ELjQn", + "attachmentId": "wdBs3e0MApgs", "title": "image.png", "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "3_SQL Console_image.png" + "dataFileName": "2_SQL Console_image.png" } ] } diff --git a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png index 6f32f76ec..1b1834ba1 100644 Binary files a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png and b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/1_SQL Console_image.png differ diff --git a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png index 1b1834ba1..a395a969b 100644 Binary files a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png and b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/2_SQL Console_image.png differ diff --git a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png deleted file mode 100644 index ccef8f7aa..000000000 Binary files a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/3_SQL Console_image.png and /dev/null differ diff --git a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.md b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.md index f5139a269..6ba851ec6 100644 --- a/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.md +++ b/docs/User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console.md @@ -1,7 +1,7 @@ # SQL Console The SQL Console is Trilium's built-in database editor. -It can be accessed by going to the [global menu](../../../Basic%20Concepts%20and%20Features/UI%20Elements) → Advanced → Open SQL Console. +It can be accessed by going to the Global menu → Advanced → Open SQL Console. ![](SQL%20Console_image.png) @@ -9,16 +9,16 @@ It can be accessed by going to the [global menu](../../../Basic%20Concepts%20and * Hovering the mouse over one of the tables listed at the top of the document will show the columns and their data type. * Only one SQL statement can be run at once. -* To run the statement, press the ![](3_SQL%20Console_image.png)icon. +* To run the statement, press the _Execute_ icon. * For queries that return a result, the data will displayed in a table. - - ![](1_SQL%20Console_image.png) + +
### Saved SQL console SQL queries or commands can be saved into a dedicated note. -To do so, simply write the query and press the ![](2_SQL%20Console_image.png)button. Once saved, the note will appear in [Day Notes](../../Advanced%20Showcases/Day%20Notes.md). +To do so, simply write the query and press the ![](1_SQL%20Console_image.png) button. Once saved, the note will appear in Day Notes. * The SQL expression will not be displayed by default, but it can still be viewed by going to the note context menu and selecting _Note source_. * The expression cannot be modified. If needed, recreate it by copying the statement back into the SQL console and then saving it again. \ No newline at end of file