mirror of
https://github.com/zadam/trilium.git
synced 2025-12-17 05:39:55 +01:00
Merge branch 'main' of github.com:TriliumNext/Trilium
This commit is contained in:
Elian Doran
156
docs/User Guide/!!!meta.json
vendored
156
docs/User Guide/!!!meta.json
vendored
@@ -331,6 +331,41 @@
|
||||
"format": "markdown",
|
||||
"dataFileName": "Using the desktop application .md",
|
||||
"attachments": []
|
||||
},
|
||||
{
|
||||
"isClone": false,
|
||||
"noteId": "Rp0q8bSP6Ayl",
|
||||
"notePath": [
|
||||
"pOsGYCXsbNQG",
|
||||
"Otzi9La2YAUX",
|
||||
"poXkQfguuA0U",
|
||||
"Rp0q8bSP6Ayl"
|
||||
],
|
||||
"title": "System Requirements",
|
||||
"notePosition": 20,
|
||||
"prefix": null,
|
||||
"isExpanded": false,
|
||||
"type": "text",
|
||||
"mime": "text/html",
|
||||
"attributes": [
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
"value": "system-requirements",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "iconClass",
|
||||
"value": "bx bx-chip",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
}
|
||||
],
|
||||
"format": "markdown",
|
||||
"dataFileName": "System Requirements.md",
|
||||
"attachments": []
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1151,6 +1186,41 @@
|
||||
"format": "markdown",
|
||||
"dataFileName": "Third-party cloud hosting.md",
|
||||
"attachments": []
|
||||
},
|
||||
{
|
||||
"isClone": false,
|
||||
"noteId": "iGTnKjubbXkA",
|
||||
"notePath": [
|
||||
"pOsGYCXsbNQG",
|
||||
"Otzi9La2YAUX",
|
||||
"WOcw2SLH6tbX",
|
||||
"iGTnKjubbXkA"
|
||||
],
|
||||
"title": "System Requirements",
|
||||
"notePosition": 140,
|
||||
"prefix": null,
|
||||
"isExpanded": false,
|
||||
"type": "text",
|
||||
"mime": "text/html",
|
||||
"attributes": [
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
"value": "system-requirements",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "iconClass",
|
||||
"value": "bx bx-chip",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
}
|
||||
],
|
||||
"format": "markdown",
|
||||
"dataFileName": "System Requirements.md",
|
||||
"attachments": []
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -8281,7 +8351,7 @@
|
||||
"dataFileName": "8_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "UdhsypjV4pzZ",
|
||||
"attachmentId": "rrLM5BQCZ5ci",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
@@ -8289,7 +8359,7 @@
|
||||
"dataFileName": "9_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "VerzwlO9y6Na",
|
||||
"attachmentId": "UdhsypjV4pzZ",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
@@ -8297,7 +8367,7 @@
|
||||
"dataFileName": "10_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "wYkQvargZlNF",
|
||||
"attachmentId": "VerzwlO9y6Na",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
@@ -8305,12 +8375,28 @@
|
||||
"dataFileName": "11_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "YFGeAN41kvZY",
|
||||
"attachmentId": "wYkQvargZlNF",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
"position": 10,
|
||||
"dataFileName": "12_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "YFGeAN41kvZY",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
"position": 10,
|
||||
"dataFileName": "13_Tables_image.png"
|
||||
},
|
||||
{
|
||||
"attachmentId": "zRLxHrKJiK8N",
|
||||
"title": "image.png",
|
||||
"role": "image",
|
||||
"mime": "image/png",
|
||||
"position": 10,
|
||||
"dataFileName": "14_Tables_image.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -15102,41 +15188,55 @@
|
||||
"name": "internalLink",
|
||||
"value": "xYjQUYhpbUEW",
|
||||
"isInheritable": false,
|
||||
"position": 30
|
||||
"position": 10
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "IakOLONlIfGI",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "CdNpE2pqjmI6",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "6f9hih2hXXZk",
|
||||
"isInheritable": false,
|
||||
"position": 60
|
||||
"position": 20
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "R7abl2fc6Mxi",
|
||||
"isInheritable": false,
|
||||
"position": 70
|
||||
"position": 30
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "bwg0e8ewQMak",
|
||||
"isInheritable": false,
|
||||
"position": 40
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "OFXdgB2nNk1F",
|
||||
"isInheritable": false,
|
||||
"position": 50
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"isInheritable": false,
|
||||
"position": 60
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "CdNpE2pqjmI6",
|
||||
"isInheritable": false,
|
||||
"position": 70
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "6f9hih2hXXZk",
|
||||
"isInheritable": false,
|
||||
"position": 80
|
||||
},
|
||||
{
|
||||
@@ -15146,20 +15246,6 @@
|
||||
"isInheritable": false,
|
||||
"position": 90
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "OFXdgB2nNk1F",
|
||||
"isInheritable": false,
|
||||
"position": 100
|
||||
},
|
||||
{
|
||||
"type": "relation",
|
||||
"name": "internalLink",
|
||||
"value": "cbkrhQjrkKrh",
|
||||
"isInheritable": false,
|
||||
"position": 110
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "shareAlias",
|
||||
|
||||
12
docs/User Guide/User Guide/Installation & Setup/Desktop Installation/System Requirements.md
vendored
Normal file
12
docs/User Guide/User Guide/Installation & Setup/Desktop Installation/System Requirements.md
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
# System Requirements
|
||||
The desktop version of Trilium supports all three main operating systems:
|
||||
|
||||
* Windows
|
||||
* Windows 11 is officially supported.
|
||||
* Windows on ARM is also supported
|
||||
* Linux:
|
||||
* Most modern distributions are supported, including NixOS.
|
||||
* ARM is supported in `aarch64` (no ARM v7 support).
|
||||
* macOS
|
||||
* Minimum supported operating system: macOS Monterey
|
||||
* Both Intel and Apple Silicon devices are supported.
|
||||
11
docs/User Guide/User Guide/Installation & Setup/Server Installation/System Requirements.md
vendored
Normal file
11
docs/User Guide/User Guide/Installation & Setup/Server Installation/System Requirements.md
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
# System Requirements
|
||||
* Using Docker, the server can be run on Windows, Linux and macOS devices.
|
||||
* Native binaries are provided for Linux x64 and ARM (`aarch64`).
|
||||
|
||||
## Legacy ARM support
|
||||
|
||||
The Docker builds also provide `linux/arm/v7` and `linux/arm/v8` platforms. These platforms are considered legacy since Trilium uses Node.js version 24 which have [officially downgraded support](https://github.com/nodejs/node/commit/6682861d6f) for these platforms to “experimental”.
|
||||
|
||||
As a result, Trilium needs to use Node.js 22 for these versions. As soon as soon Node.js 22 will no longer be compatible, support for `armv7` and `armv8` will be dropped entirely.
|
||||
|
||||
Regardless of upstream support, these platforms are supported on a best-effort basis and are not officially supported by the Trilium development team. Bug reports are accepted but they will not be treated with priority; contributions are welcome.
|
||||
@@ -112,7 +112,7 @@ For family specifically it's pretty useful to create [relation map](../Note%20Ty
|
||||
|
||||
<figure class="image"><img style="aspect-ratio:941/758;" src="Patterns of personal knowl.png" width="941" height="758"></figure>
|
||||
|
||||
<a class="reference-link" href="/images/relation-map-family.png|width=800">[missing note]</a>
|
||||
<a class="reference-link" href="#root/lQcnSv5DMSe1">[missing note]</a>
|
||||
|
||||
### Books
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 871 B After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 871 B |
Binary file not shown.
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 249 B |
BIN
docs/User Guide/User Guide/Note Types/Text/13_Tables_image.png
vendored
Normal file
BIN
docs/User Guide/User Guide/Note Types/Text/13_Tables_image.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 219 B |
BIN
docs/User Guide/User Guide/Note Types/Text/14_Tables_image.png
vendored
Normal file
BIN
docs/User Guide/User Guide/Note Types/Text/14_Tables_image.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 473 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 541 B |
@@ -9,13 +9,13 @@ To create a table, simply press the table button and select with the mouse the d
|
||||
|
||||
When a table is selected, a special formatting toolbar will appear:
|
||||
|
||||
<img src="9_Tables_image.png" width="384" height="100">
|
||||
<img src="10_Tables_image.png" width="384" height="100">
|
||||
|
||||
## Navigating a table
|
||||
|
||||
* Using the mouse:
|
||||
* Click on a cell to focus it.
|
||||
* Click the <img src="10_Tables_image.png" width="28" height="27"> button at the top or the bottom of a table to insert an empty paragraph near it.
|
||||
* Click the <img src="11_Tables_image.png" width="28" height="27"> button at the top or the bottom of a table to insert an empty paragraph near it.
|
||||
* Click the <img src="5_Tables_image.png" width="24" height="26"> button at the top-left of the table to select it entirely (for easy copy-pasting or cutting) or drag and drop it to relocate the table.
|
||||
* Using the keyboard:
|
||||
* Use the arrow keys on the keyboard to easily navigate between cells.
|
||||
@@ -48,7 +48,7 @@ More options are available by pressing the arrow next to it:
|
||||
|
||||
<figure class="image image-style-align-right"><img style="aspect-ratio:312/311;" src="2_Tables_image.png" width="312" height="311"></figure>
|
||||
|
||||
The table properties can be accessed via the <img src="12_Tables_image.png" width="19" height="19"> button and allows for the following adjustments:
|
||||
The table properties can be accessed via the <img src="13_Tables_image.png" width="19" height="19"> button and allows for the following adjustments:
|
||||
|
||||
* Border (not the border of the cells, but the outer rim of the table), which includes the style (single, double), color and width.
|
||||
* The background color, with none set by default.
|
||||
@@ -63,7 +63,7 @@ The table will immediately update to reflect the changes, but the _Save_ button
|
||||
|
||||
<figure class="image image-style-align-right"><img style="aspect-ratio:320/386;" src="3_Tables_image.png" width="320" height="386"></figure>
|
||||
|
||||
Similarly to table properties, the <img src="11_Tables_image.png" width="19" height="19"> button opens a popup which adjusts the styling of one or more cells (based on the user's selection).
|
||||
Similarly to table properties, the <img src="12_Tables_image.png" width="19" height="19"> button opens a popup which adjusts the styling of one or more cells (based on the user's selection).
|
||||
|
||||
The following options can be adjusted:
|
||||
|
||||
@@ -79,7 +79,25 @@ The cell will immediately update to reflect the changes, but the _Save_ button m
|
||||
|
||||
Press the <img src="4_Tables_image.png" width="18" height="17"> button to insert a caption or a text description of the table, which is going to be displayed above the table.
|
||||
|
||||
## Tables with invisible borders
|
||||
## Table borders
|
||||
|
||||
By default, tables will come with a predefined gray border.
|
||||
|
||||
To adjust the borders, follow these steps:
|
||||
|
||||
1. Select the table.
|
||||
2. In the floating panel, select the _Table properties_ option (<img src="14_Tables_image.png" width="21" height="21">).
|
||||
1. Look for the _Border_ section at the top of the newly opened panel.
|
||||
2. This will control the outer borders of the table.
|
||||
3. Select a style for the border. Generally _Single_ is the desirable option.
|
||||
4. Select a color for the border.
|
||||
5. Select a width for the border, expressed in pixels.
|
||||
3. Select all the cells of the table and then press the _Cell properties_ option (<img src="9_Tables_image.png" width="21" height="21">).
|
||||
1. This will control the inner borders of the table, at cell level.
|
||||
2. Note that it's possible to change the borders individually by selecting one or more cells, case in which it will only change the borders that intersect these cells.
|
||||
3. Repeat the same steps as from step (2).
|
||||
|
||||
### Tables with invisible borders
|
||||
|
||||
Tables can be set to have invisible borders in order to allow for basic layouts (columns, grids) of text or [images](Images.md) without the distraction of their border:
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Script API
|
||||
For [script code notes](../Scripting.md), Trilium offers an API that gives them access to various features of the application.
|
||||
tFor [script code notes](../Scripting.md), Trilium offers an API that gives them access to various features of the application.
|
||||
|
||||
There are two APIs:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user