diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index f71a078ad..c68018d90 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -2222,11 +2222,56 @@ "value": "bx bx-history", "isInheritable": false, "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "xYmIYSP6wE3F", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "YtSN43OrfzaA", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "OR8WJ7Iz9K4U", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "9sRHySam5fXb", + "isInheritable": false, + "position": 50 } ], "format": "markdown", "dataFileName": "Recent Changes.md", - "attachments": [] + "attachments": [ + { + "attachmentId": "3HsqEVy53S2H", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Recent Changes_image.png" + }, + { + "attachmentId": "dxoiP89lrRn6", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Recent Changes_image.png" + } + ] } ] }, @@ -2301,13 +2346,6 @@ "isInheritable": false, "position": 80 }, - { - "type": "relation", - "name": "internalLink", - "value": "CoFPLs3dRlXc", - "isInheritable": false, - "position": 90 - }, { "type": "label", "name": "shareAlias", @@ -2321,6 +2359,20 @@ "value": "bx bx-notepad", "isInheritable": false, "position": 100 + }, + { + "type": "relation", + "name": "internalLink", + "value": "r5JGHN99bVKn", + "isInheritable": false, + "position": 110 + }, + { + "type": "relation", + "name": "internalLink", + "value": "CoFPLs3dRlXc", + "isInheritable": false, + "position": 120 } ], "format": "markdown", diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Notes.md b/docs/User Guide/User Guide/Basic Concepts and Features/Notes.md index 381e59000..f8d870232 100644 --- a/docs/User Guide/User Guide/Basic Concepts and Features/Notes.md +++ b/docs/User Guide/User Guide/Basic Concepts and Features/Notes.md @@ -23,7 +23,7 @@ Tree structure of notes can resemble file system - but compared to that notes in When you delete a note in Trilium, it is actually only marked for deletion (soft-delete) - the actual content, title, attributes etc. are not deleted, only hidden. -Within (by default) 7 days, it is possible to undelete these soft-deleted notes - open Recent Changes dialog, and you will see a list of all modified notes including the deleted ones. Notes available for undeletion have a link to do so. This is kind of "trash can" functionality known from e.g. Windows. +Within (by default) 7 days, it is possible to undelete these soft-deleted notes - open the Recent Changes dialog, and you will see a list of all modified notes including the deleted ones. Notes available for undeletion have a link to do so. This is kind of "trash can" functionality known from e.g. Windows. Clicking an undelete will recover the note, it's content and attributes - note should be just as before being deleted. This action will also undelete note's children which have been deleted in the same action. @@ -33,4 +33,4 @@ After the 7 days (configurable) the notes will be "erased" - their title, conten ## See also -* [Read-only note](Notes/Read-Only%20Notes.md) \ No newline at end of file +* Read-Only Notes \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png new file mode 100644 index 000000000..0a34b08e6 Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.md index e69de29bb..8c5929fdb 100644 --- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.md +++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.md @@ -0,0 +1,14 @@ +# Recent Changes +
+ +## Accessing the recent changes + +* For an overview of the changes across all documents, press the button in the Launch Bar. + * If there is a [hoisted note](../Navigation/Note%20Hoisting.md) or a [workspace](../Navigation/Workspaces.md), the list of recent changes will be limited to the descendents of the hoisted note, or the workspace. +* To limit the list of recent changes to a note and its descendants, look for the corresponding option in the Note tree contextual menu → Advanced. + +## Interaction + +* Notes which were changed will appear in reverse chronological order (latest update first). +* The title of the note is displayed, as well as the note path. Clicking on the note title will dismiss the dialog and navigate to that particular note. +* Deleted notes will also be listed here, at their time of deletion. Press the _Undelete_ link next to them in order to recover them. \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png new file mode 100644 index 000000000..93c1615d5 Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/!!!meta.json b/src/public/app/doc_notes/en/User Guide/!!!meta.json index 5560b4d28..d6f2de8d2 100644 --- a/src/public/app/doc_notes/en/User Guide/!!!meta.json +++ b/src/public/app/doc_notes/en/User Guide/!!!meta.json @@ -2222,11 +2222,56 @@ "value": "bx bx-history", "isInheritable": false, "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "xYmIYSP6wE3F", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "YtSN43OrfzaA", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "OR8WJ7Iz9K4U", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "9sRHySam5fXb", + "isInheritable": false, + "position": 50 } ], "format": "html", "dataFileName": "Recent Changes.html", - "attachments": [] + "attachments": [ + { + "attachmentId": "3HsqEVy53S2H", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Recent Changes_image.png" + }, + { + "attachmentId": "dxoiP89lrRn6", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Recent Changes_image.png" + } + ] } ] }, @@ -2301,13 +2346,6 @@ "isInheritable": false, "position": 80 }, - { - "type": "relation", - "name": "internalLink", - "value": "CoFPLs3dRlXc", - "isInheritable": false, - "position": 90 - }, { "type": "label", "name": "shareAlias", @@ -2321,6 +2359,20 @@ "value": "bx bx-notepad", "isInheritable": false, "position": 100 + }, + { + "type": "relation", + "name": "internalLink", + "value": "r5JGHN99bVKn", + "isInheritable": false, + "position": 110 + }, + { + "type": "relation", + "name": "internalLink", + "value": "CoFPLs3dRlXc", + "isInheritable": false, + "position": 120 } ], "format": "html", diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes.html index 30a2f01c3..30bbda0d1 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes.html @@ -43,10 +43,10 @@ (soft-delete) - the actual content, title, attributes etc. are not deleted, only hidden.

Within (by default) 7 days, it is possible to undelete these soft-deleted - notes - open Recent Changes dialog, and you will see a list of all modified - notes including the deleted ones. Notes available for undeletion have a - link to do so. This is kind of "trash can" functionality known from e.g. - Windows.

+ notes - open the Recent Changes dialog, + and you will see a list of all modified notes including the deleted ones. + Notes available for undeletion have a link to do so. This is kind of "trash + can" functionality known from e.g. Windows.

Clicking an undelete will recover the note, it's content and attributes - note should be just as before being deleted. This action will also undelete note's children which have been deleted in the same action.

@@ -60,7 +60,7 @@ href="../Installation%20%26%20Setup/Backup.html">Backup).

See also

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png new file mode 100644 index 000000000..0a34b08e6 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Recent Changes_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.html index 006cb65aa..b045ed36c 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes.html @@ -12,7 +12,38 @@

Recent Changes

-
+
+
+ +
+

Accessing the recent changes

+ +

Interaction

+ +
diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png new file mode 100644 index 000000000..93c1615d5 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes_image.png differ