Merge remote-tracking branch 'origin/main'

Author: eliandoran

apps/build-docs/package.json

@@ -11,7 +11,7 @@
   "license": "AGPL-3.0-only",
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@redocly/cli": "2.10.0",
+    "@redocly/cli": "2.11.0",
     "archiver": "7.0.1",
     "fs-extra": "11.3.2",
     "react": "19.2.0",

apps/client/src/services/shortcuts.spec.ts

@@ -159,7 +159,7 @@ describe("shortcuts", () => {
             expect(matchesShortcut(event, "Shift+F1")).toBeTruthy();
 
             // Special keys
-            for (const keyCode of [ "Delete", "Enter" ]) {
+            for (const keyCode of [ "Delete", "Enter", "NumpadEnter" ]) {
                 event = createKeyboardEvent({ key: keyCode, code: keyCode });
                 expect(matchesShortcut(event, keyCode), `Key ${keyCode}`).toBeTruthy();
             }

apps/client/src/services/shortcuts.ts

@@ -46,6 +46,7 @@ for (let i = 1; i <= 19; i++) {
 const KEYCODES_WITH_NO_MODIFIER = new Set([
     "Delete",
     "Enter",
+    "NumpadEnter",
     ...functionKeyCodes
 ]);
 

apps/edit-docs/demo/!!!meta.json

@@ -1,6 +1,6 @@
 {
 	"formatVersion": 2,
-	"appVersion": "0.99.2",
+	"appVersion": "0.99.3",
 	"files": [
 		{
 			"isClone": false,
@@ -2700,6 +2700,7 @@
 								}
 							],
 							"format": "html",
+							"dataFileName": "Note Types.html",
 							"attachments": [],
 							"dirFileName": "Note Types",
 							"children": [

apps/edit-docs/demo/navigation.html

@@ -270,7 +270,7 @@
                   </li>
                 </ul>
               </li>
-              <li>Note Types
+              <li><a href="root/Trilium%20Demo/Note%20Types.html" target="detail">Note Types</a>
                 <ul>
                   <li><a href="root/Trilium%20Demo/Note%20Types/Canvas.json" target="detail">Canvas</a>
                   </li>

apps/edit-docs/demo/root/Miscellaneous/Day Note Template.html

@@ -14,6 +14,7 @@ <h1 data-trilium-h1>Day Note Template</h1>
 
       <div class="ck-content">
         <h2>☑️ Tasks</h2>
+
         <ul>
           <li data-list-item-id="e4b26220d6ce48997f1116dc1d1d83dc0">[…]</li>
         </ul>

apps/edit-docs/demo/root/Trilium Demo.html

@@ -14,34 +14,28 @@ <h1 data-trilium-h1>Trilium Demo</h1>
 
       <div class="ck-content">
         <figure class="image image-style-align-right image_resized" style="width:29.84%;">
-          <img style="aspect-ratio:150/150;" src="Trilium Demo_icon-color.svg" width="150"
-          height="150">
+          <img style="aspect-ratio:150/150;" src="Trilium Demo_icon-color.svg"
+          width="150" height="150">
         </figure>
         <p><strong>Welcome to Trilium Notes!</strong>
-
         </p>
         <p>This is a "demo" document packaged with Trilium to showcase some of its
           features and also give you some ideas on how you might structure your notes.
           You can play with it, and modify the note content and tree structure as
           you wish.</p>
         <p>If you need any help, visit <a href="https://triliumnotes.org">triliumnotes.org</a> or
           our <a href="https://github.com/TriliumNext">GitHub repository</a>
-
         </p>
          <h2>Cleanup</h2>
-
         <p>Once you're finished with experimenting and want to cleanup these pages,
           you can simply delete them all.</p>
          <h2>Formatting</h2>
-
         <p>Trilium supports classic formatting like <em>italic</em>, <strong>bold</strong>, <em><strong>bold and italic</strong></em>.
           You can add links pointing to <a href="https://triliumnotes.org/">external pages</a> or&nbsp;
           <a
           class="reference-link" href="Trilium%20Demo/Formatting%20examples">Formatting examples</a>.</p>
          <h3>Lists</h3>
-
         <p><strong>Ordered:</strong>
-
         </p>
         <ol>
           <li data-list-item-id="e877cc655d0239b8bb0f38696ad5d8abb">First Item</li>
@@ -56,7 +50,6 @@ <h3>Lists</h3>
           </li>
         </ol>
         <p><strong>Unordered:</strong>
-
         </p>
         <ul>
           <li data-list-item-id="e68bf4b518a16671c314a72073c3d900a">Item</li>
@@ -67,17 +60,16 @@ <h3>Lists</h3>
           </li>
         </ul>
          <h3>Block quotes</h3>
-
         <blockquote>
           <p>Whereof one cannot speak, thereof one must be silent”</p>
           <p>– Ludwig Wittgenstein</p>
         </blockquote>
         <hr>
         <p>See also other examples like <a href="Trilium%20Demo/Formatting%20examples/School%20schedule.html">tables</a>,
           <a
-          href="Trilium%20Demo/Formatting%20examples/Checkbox%20lists.html">checkbox lists,</a> <a href="Trilium%20Demo/Formatting%20examples/Highlighting.html">highlighting</a>,
+          href="Trilium%20Demo/Formatting%20examples/Checkbox%20lists.html">checkbox lists,</a> <a href="Trilium%20Demo/Formatting%20examples/Highlighting.html">highlighting</a>, <a href="Trilium%20Demo/Formatting%20examples/Code%20blocks.html">code blocks</a>and
             <a
-            href="Trilium%20Demo/Formatting%20examples/Code%20blocks.html">code blocks</a>and <a href="Trilium%20Demo/Formatting%20examples/Math.html">math examples</a>.</p>
+            href="Trilium%20Demo/Formatting%20examples/Math.html">math examples</a>.</p>
       </div>
     </div>
   </body>

apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Code blocks.html

@@ -21,8 +21,12 @@ <h1 data-trilium-h1>Code blocks</h1>
           language, should that fail it is possible to manually adjust it. The color
           scheme for the syntax highlighting is adjustable in settings.&nbsp;</p><pre><code class="language-application-javascript-env-frontend">function helloWorld() {
 
+
+
 	alert("Hello world");
 
+
+
 }</code></pre>
         <p>For larger pieces of code it is better to use a code note, which uses
           a fully-fledged code editor (CodeMirror). For an example of a code note,

apps/edit-docs/demo/root/Trilium Demo/Note Types.html

@@ -0,0 +1,21 @@
+<html>
+  
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="../../style.css">
+    <base target="_parent">
+    <title data-trilium-title>Note Types</title>
+  </head>
+  
+  <body>
+    <div class="content">
+       <h1 data-trilium-h1>Note Types</h1>
+
+      <div class="ck-content">
+        <p>T</p>
+      </div>
+    </div>
+  </body>
+
+</html>

apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager.html

@@ -13,9 +13,8 @@
        <h1 data-trilium-h1>Task manager</h1>
 
       <div class="ck-content">
-        <p>This is a simple TODO/Task manager. You can see some description and explanation
-          here: <a href="https://github.com/zadam/trilium/wiki/Task-manager">https://github.com/zadam/trilium/wiki/Task-manager</a>
-        </p>
+        <p>This is a simple TODO/Task manager. See the <a href="https://docs.triliumnotes.org/user-guide/advanced-usage/advanced-showcases/task-manager">Trilium documentation</a> for
+          information on how it works.</p>
         <p>Please note that this is meant as scripting example only and feature/bug
           support is very limited.</p>
       </div>