You can easily restore the demo notes by using Trilium's built-in import feature by importing them:
-
-
- Download this .zip archive with +
- Download this .zip archive with the latest version of the demo notes
- Right click on any note in your tree under which you would like the demo notes to be imported diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/ETAPI (REST API).html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/ETAPI (REST API).html index a7ea78e55..a9ae4e829 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/ETAPI (REST API).html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/ETAPI (REST API).html @@ -1,6 +1,6 @@
ETAPI is Trilium's public/external REST API. It is available since Trilium v0.50.
-The documentation is in OpenAPI format, available here.
+The documentation is in OpenAPI format, available here.
API clients
As an alternative to calling the API directly, there are client libraries to simplify this
@@ -11,7 +11,7 @@Obtaining a token
All operations with the REST API have to be authenticated using a token.
You can get this token either from Options -> ETAPI or programmatically
- using the /auth/login REST call (see the spec).
/auth/login REST call (see the spec).
Authentication
Via the Authorization header
GET https://myserver.com/etapi/app-info
Authorization: ETAPITOKENLimitations
All resources (except for images) are created as note's attachments.
HTML inside ENEX files is not exactly valid so some formatting maybe broken - or lost. You can report major problems into Trilium issue tracker.
\ No newline at end of file + or lost. You can report major problems into Trilium issue tracker. \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to.html index 134d0cc09..2cc679ed8 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to.html @@ -2,26 +2,27 @@
+
Jump to Note
The Jump to Note function allows easy navigation between notes by searching for their title. In addition to that, it can also trigger a full search or create notes.
To enter the “Jump to” dialog:
-
-
- In the Launch Bar, +
- In the Launch Bar,
press
button.
- - Using the keyboard, press Ctrl + J. +
- Using the keyboard, press Ctrl + J.
In addition to searching for notes, it is also possible to search for commands. See the dedicated section below for more information.
Interaction
-
-
- By default, when there is no text entered it will display the most recent +
- By default, when there is no text entered it will display the most recent notes. -
- Using the keyboard, use the up or down arrow keys to navigate between +
- Using the keyboard, use the up or down arrow keys to navigate between items. Press Enter to open the desired note. -
- If the note doesn't exist, it's possible to create it by typing the desired +
- If the note doesn't exist, it's possible to create it by typing the desired note title and selecting the Create and link child note option.
Recent notes
@@ -43,34 +44,32 @@Interaction
To trigger the command palette:
-
-
- Press Ctrl+Shift+J to display the command +
- Press Ctrl+Shift+J to display the command palette directly. -
- If in the “Jump to” dialog, type
>in the search to switch + - If in the “Jump to” dialog, type
>in the search to switch to the command palette.
Interaction:
-
-
- Type a few words to filter between commands. -
- Use the up and down arrows on the keyboard or the mouse to select a command. -
- Press Enter to execute the command. +
- Type a few words to filter between commands. +
- Use the up and down arrows on the keyboard or the mouse to select a command. +
- Press Enter to execute the command.
To exit the command palette:
-
-
- Remove the
>in the search to go back to the note search.
- - Press Esc to dismiss the dialog entirely. +
- Remove the
>in the search to go back to the note search.
+ - Press Esc to dismiss the dialog entirely.
Options available
Currently the following options are displayed:
-
-
- Most of the Keyboard Shortcuts have +
- Most of the Keyboard Shortcuts have an entry, with the exception of those that are too specific to be run from a dialog. -
- Some additional options which are not yet available as keyboard shortcuts, +
- Some additional options which are not yet available as keyboard shortcuts, but can be accessed from various menus such as: exporting a note, showing attachments, searching for notes or configuring the Launch Bar. + href="#root/_help_xYmIYSP6wE3F">Launch Bar.
Limitations
Currently it's not possible to define custom actions that are displayed diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery.html index 8c0b36912..782a2f36b 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery.html @@ -120,5 +120,5 @@
\ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Backup.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Backup.html index 754946d1c..457914ff2 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Backup.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Backup.html @@ -50,4 +50,4 @@ noBackup=trueYou can also review the configuration file
to provide all config.ini values as environment variables instead.
See sample config.
\ No newline at end of file +See sample config.
\ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Desktop Installation.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Desktop Installation.html index 6057d513f..5ce56d645 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Desktop Installation.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Desktop Installation.html @@ -1,7 +1,7 @@To install Trilium on your desktop, follow these steps:
- Download the Latest Release: Obtain the appropriate binary - release for your operating system from the latest release page on + release for your operating system from the latest release page on GitHub.
- Extract the Package: Unzip the downloaded package to a location of your choice. diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html index f7138444d..53a0a5cd6 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html @@ -19,8 +19,8 @@ its derivatives (like Ubuntu) below:
- SSH into your server
- use
wget(orcurl) to download latestTriliumNotes-Server-[VERSION]-linux-x64.tar.xz(copy - link from release page, + link from release page, notice-Serversuffix) on your server. - unpack the archive, e.g. using
tar -xf -d TriliumNotes-Server-[VERSION]-linux-x64.tar.xz
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache.html
index ffb2f921d..4e2bedc8a 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache.html
@@ -2,8 +2,8 @@
you want to use for your Trilium server.
-
-
Download docker image and create container
+docker pull triliumnext/notes:[VERSION] - docker create --name trilium -t -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/notes:[VERSION]Download docker image and create container
docker pull triliumnext/trilium:[VERSION] + docker create --name trilium -t -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/trilium:[VERSION] -
Configure Apache proxy and websocket proxy
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.html index 224885034..36d1cb7e4 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.html @@ -8,7 +8,7 @@ - Docker Server Installation: Pull the new image and restart the container.
- Other Installations: Download the latest version from - the release page and + the release page and replace the existing application files.
- Use GitHub issues for reporting: https://github.com/TriliumNext/Notes/issues +
- Use GitHub issues for reporting: https://github.com/TriliumNext/Trilium/issues
- Refer to the error logs page for information on providing necessary details. diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Error logs.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Error logs.html index 362ec507b..aac70a7d9 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Error logs.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Error logs.html @@ -32,7 +32,7 @@
sudo apt install libpng16-16 libpng-dev pkg-config autoconf libtool build-essential nasm libx11-dev libxkbfile-devInstallation
Download
-You can either download source code zip/tar from https://github.com/TriliumNext/Notes/releases/latest.
-For the latest version including betas, clone Git repository from main branch with:
git clone -b main https://github.com/triliumnext/notes.gitYou can either download source code zip/tar from https://github.com/TriliumNext/Trilium/releases/latest.
+For the latest version including betas, clone Git repository from main branch with:
git clone -b main https://github.com/triliumnext/trilium.gitInstallation
cd trilium
# download all node dependencies
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html
index 8cff3851b..4fd608881 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html
@@ -4,7 +4,7 @@
Database Compatibility and Migration
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting.html
index 77d1aa2dc..951ae6578 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting.html
@@ -54,7 +54,7 @@ UPDATE options SET value = 'QpC8XoiYYeqHPtHKRtbNxfTHsk+pEBqVBODYp0FkPBa22tlBBKBM
Reporting Bugs
Reporting bugs is highly valuable. Here are some tips:
- If you don't feel comfortable attaching the logs or anything sensitive
to the public GitHub issues, feel free to contact the devs in our Matrix
support channel.
+ href="https://github.com/TriliumNext/Trilium#-discuss-with-us">support channel.
Use this email to also provide anything which could assist in analysing
the bug - e.g. files/images/ZIPs being imported or anonymized database.
Exporting note subtree for reproduction
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Reporting issues.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Reporting issues.html
index 4af29831e..20e8aae89 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Reporting issues.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Troubleshooting/Reporting issues.html
@@ -1,3 +1,3 @@
-Go to Issues · TriliumNext/Notes and
+
Go to Issues · TriliumNext/Trilium and
press “New issue”.
If you are reporting a bug, select “Bug Report” and fill in the details.
\ No newline at end of file
diff --git a/docs/Developer Guide/!!!meta.json b/docs/Developer Guide/!!!meta.json
index 0b94c1dd6..aee04e341 100644
--- a/docs/Developer Guide/!!!meta.json
+++ b/docs/Developer Guide/!!!meta.json
@@ -1,6 +1,6 @@
{
"formatVersion": 2,
- "appVersion": "0.97.1",
+ "appVersion": "0.97.2",
"files": [
{
"isClone": false,
diff --git a/docs/Release Notes/!!!meta.json b/docs/Release Notes/!!!meta.json
index 2ac0a41e7..15bd2e6f2 100644
--- a/docs/Release Notes/!!!meta.json
+++ b/docs/Release Notes/!!!meta.json
@@ -1,6 +1,6 @@
{
"formatVersion": 2,
- "appVersion": "0.97.1",
+ "appVersion": "0.97.2",
"files": [
{
"isClone": false,
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index 8620611a5..ba9bbfbf7 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -1,6 +1,6 @@
{
"formatVersion": 2,
- "appVersion": "0.97.1",
+ "appVersion": "0.97.2",
"files": [
{
"isClone": false,
@@ -3794,23 +3794,23 @@
{
"type": "relation",
"name": "internalLink",
- "value": "xYmIYSP6wE3F",
+ "value": "A9Oc6YKKc65v",
"isInheritable": false,
"position": 10
},
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "xYmIYSP6wE3F",
+ "isInheritable": false,
+ "position": 20
+ },
{
"type": "label",
"name": "iconClass",
"value": "bx bx-send",
"isInheritable": false,
"position": 10
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "A9Oc6YKKc65v",
- "isInheritable": false,
- "position": 20
}
],
"format": "markdown",