chore(release): 0.92.3-beta

fix(deps): update dependency axios to v1.8.2 [security]

.github/actions/build-electron/action.yml

@@ -1,3 +1,6 @@
+name: "Build Electron App"
+description: "Builds and packages the Electron app for different platforms"
+
 inputs:
   os:
     description: "One of the supported platforms: macos, linux, windows"
@@ -6,15 +9,47 @@ inputs:
     description: "The architecture to build for: x64, arm64"
     required: true
   extension:
-    description: "Platform specific extensions to copy in the output: dmg, deb, rpm, exe"
+    description: "Platform specific extensions to copy in the output: dmg, deb, rpm, exe, zip"
     required: true
+
 runs:
   using: composite
   steps:
-    - name: Set up Python for appdmg to be installed
+    # Certificate setup
+    - name: Import Apple certificates
+      if: inputs.os == 'macos'
+      uses: apple-actions/import-codesign-certs@v3
+      with:
+        p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
+        p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
+        keychain: build
+        keychain-password: ${{ github.run_id }}
+
+    - name: Install Installer certificate
+      if: inputs.os == 'macos'
+      uses: apple-actions/import-codesign-certs@v3
+      with:
+        p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
+        p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
+        keychain: build
+        keychain-password: ${{ github.run_id }}
+        # We don't need to create a keychain here because we're using the build keychain that was created in the previous step
+        create-keychain: false
+
+    - name: Verify certificates
+      if: inputs.os == 'macos'
+      shell: bash
+      run: |
+        echo "Available signing identities:"
+        security find-identity -v -p codesigning build.keychain
+
+    - name: Set up Python and other macOS dependencies
       if: ${{ inputs.os == 'macos' }}
       shell: bash
-      run: brew install python-setuptools
+      run: |
+        brew install python-setuptools
+        brew install create-dmg
+
     - name: Install dependencies for RPM and Flatpak package building
       if: ${{ inputs.os == 'linux' }}
       shell: bash
@@ -24,25 +59,155 @@ runs:
         FLATPAK_ARCH=$(if [[ ${{ inputs.arch }} = 'arm64' ]]; then echo 'aarch64'; else echo 'x86_64'; fi)
         FLATPAK_VERSION='24.08'
         flatpak install --user --no-deps --arch $FLATPAK_ARCH --assumeyes runtime/org.freedesktop.Platform/$FLATPAK_ARCH/$FLATPAK_VERSION runtime/org.freedesktop.Sdk/$FLATPAK_ARCH/$FLATPAK_VERSION org.electronjs.Electron2.BaseApp/$FLATPAK_ARCH/$FLATPAK_VERSION
+
+    # Build setup
     - name: Install dependencies
       shell: bash
       run: npm ci
-    - name: Temporary Flatpak arm64 workaround till https://github.com/electron/forge/pull/3839 is merged
-      if: ${{ inputs.os == 'linux' && inputs.arch == 'arm64' }}
-      shell: bash
-      run:  sed -e "s/case 'armv7l'/case 'arm64'/g" -e "s/return 'arm'/return 'aarch64'/g" -i node_modules/@electron-forge/maker-flatpak/dist/MakerFlatpak.js
+
     - name: Update build info
       shell: bash
       run: npm run chore:update-build-info
-    - name: Run electron-forge
+
+    # Critical debugging configuration
+    - name: Run electron-forge build with enhanced logging
       shell: bash
-      run: npm run electron-forge:make -- --arch=${{ inputs.arch }}
+      env:
+        # Pass through required environment variables for signing and notarization
+        APPLE_TEAM_ID: ${{ env.APPLE_TEAM_ID }}
+        APPLE_ID: ${{ env.APPLE_ID }}
+        APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
+      run: |
+        # Map OS names to Electron Forge platform names
+        if [ "${{ inputs.os }}" = "macos" ]; then
+          PLATFORM="darwin"
+        elif [ "${{ inputs.os }}" = "windows" ]; then
+          PLATFORM="win32"
+        else
+          PLATFORM="${{ inputs.os }}"
+        fi
+
+        npm run electron-forge:make -- \
+          --arch=${{ inputs.arch }} \
+          --platform=$PLATFORM
+
+    # Add DMG signing step
+    - name: Sign DMG
+      if: inputs.os == 'macos'
+      shell: bash
+      run: |
+        echo "Signing DMG file..."
+        dmg_file=$(find out -name "*.dmg" -print -quit)
+        if [ -n "$dmg_file" ]; then
+          echo "Found DMG: $dmg_file"
+          # Get the first valid signing identity from the keychain
+          SIGNING_IDENTITY=$(security find-identity -v -p codesigning build.keychain | grep "Developer ID Application" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
+          if [ -z "$SIGNING_IDENTITY" ]; then
+            echo "Error: No valid Developer ID Application certificate found in keychain"
+            exit 1
+          fi
+          echo "Using signing identity: $SIGNING_IDENTITY"
+          # Sign the DMG
+          codesign --force --sign "$SIGNING_IDENTITY" --options runtime --timestamp "$dmg_file"
+          # Notarize the DMG
+          xcrun notarytool submit "$dmg_file" --apple-id "$APPLE_ID" --password "$APPLE_ID_PASSWORD" --team-id "$APPLE_TEAM_ID" --wait
+          # Staple the notarization ticket
+          xcrun stapler staple "$dmg_file"
+        else
+          echo "No DMG found to sign"
+        fi
+
+    - name: Verify code signing
+      if: inputs.os == 'macos'
+      shell: bash
+      run: |
+        echo "Verifying code signing for all artifacts..."
+
+        # First check the .app bundle
+        echo "Looking for .app bundle..."
+        app_bundle=$(find out -name "*.app" -print -quit)
+        if [ -n "$app_bundle" ]; then
+          echo "Found app bundle: $app_bundle"
+          echo "Verifying app bundle signing..."
+          codesign --verify --deep --strict --verbose=2 "$app_bundle"
+          echo "Displaying app bundle signing info..."
+          codesign --display --verbose=2 "$app_bundle"
+
+          echo "Checking entitlements..."
+          codesign --display --entitlements :- "$app_bundle"
+
+          echo "Checking notarization status..."
+          xcrun stapler validate "$app_bundle" || echo "Warning: App bundle not notarized yet"
+        else
+          echo "No .app bundle found to verify"
+        fi
+
+        # Then check DMG if it exists
+        echo "Looking for DMG..."
+        dmg_file=$(find out -name "*.dmg" -print -quit)
+        if [ -n "$dmg_file" ]; then
+          echo "Found DMG: $dmg_file"
+          echo "Verifying DMG signing..."
+          codesign --verify --deep --strict --verbose=2 "$dmg_file"
+          echo "Displaying DMG signing info..."
+          codesign --display --verbose=2 "$dmg_file"
+
+          echo "Checking DMG notarization..."
+          xcrun stapler validate "$dmg_file" || echo "Warning: DMG not notarized yet"
+        else
+          echo "No DMG found to verify"
+        fi
+
+        # Finally check ZIP if it exists
+        echo "Looking for ZIP..."
+        zip_file=$(find out -name "*.zip" -print -quit)
+        if [ -n "$zip_file" ]; then
+          echo "Found ZIP: $zip_file"
+          echo "Note: ZIP files are not code signed, but their contents should be"
+        fi
+
     - name: Prepare artifacts
       shell: bash
       run: |
-        mkdir -p upload;
-        for ext in ${{ inputs.extension }};
-        do
-          file=$(find out/make -name "*.$ext" -print -quit);
-          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.$ext";
+        mkdir -p upload
+
+        if [ "${{ inputs.os }}" = "macos" ]; then
+          # For macOS, we need to look in specific directories based on the maker
+          echo "Collecting macOS artifacts..."
+
+          # Look for DMG files recursively
+          echo "Looking for DMG files..."
+          dmg_file=$(find out -name "*.dmg" -print -quit)
+          if [ -n "$dmg_file" ]; then
+            echo "Found DMG: $dmg_file"
+            cp "$dmg_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.dmg"
+          else
+            echo "Warning: No DMG file found"
+          fi
+
+          # Look for ZIP files recursively
+          echo "Looking for ZIP files..."
+          zip_file=$(find out -name "*.zip" -print -quit)
+          if [ -n "$zip_file" ]; then
+            echo "Found ZIP: $zip_file"
+            cp "$zip_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.zip"
+          else
+            echo "Warning: No ZIP file found"
+          fi
+        else
+          # For other platforms, use the existing logic but with better error handling
+          echo "Collecting artifacts for ${{ inputs.os }}..."
+          for ext in ${{ inputs.extension }}; do
+            echo "Looking for .$ext files..."
+            file=$(find out -name "*.$ext" -print -quit)
+            if [ -n "$file" ]; then
+              echo "Found $file for extension $ext"
+              cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.$ext"
+            else
+              echo "Warning: No file found with extension .$ext"
+            fi
           done
+        fi
+
+        echo "Final contents of upload directory:"
+        ls -la upload/

.github/workflows/dev.yml

@@ -33,6 +33,10 @@ jobs:
 
       - name: Run the TypeScript build
         run: npx tsc
+
+      - name: Run the unit tests
+        run: npm run test
+
   build_docker:
     name: Build Docker image
     runs-on: ubuntu-latest

.github/workflows/main.yml

@@ -43,6 +43,21 @@ jobs:
           os: ${{ matrix.os.name }}
           arch: ${{ matrix.arch }}
           extension: ${{ matrix.os.extension }}
+        env:
+          APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
+          APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
+          APPLE_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
+          APPLE_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+
+      # Clean up keychain after build
+      - name: Clean up keychain
+        if: matrix.os.name == 'macos' && always()
+        run: |
+          security delete-keychain build.keychain
+
       - name: Publish artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/nightly.yml

@@ -2,7 +2,7 @@ name: Nightly Release
 on:
   # This can be used to automatically publish nightlies at UTC nighttime
   schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
+    - cron: "0 2 * * *" # run at 2 AM UTC
   # This can be used to allow manually triggering nightlies from the web interface
   workflow_dispatch:
 env:
@@ -45,6 +45,14 @@ jobs:
           os: ${{ matrix.os.name }}
           arch: ${{ matrix.arch }}
           extension: ${{ join(matrix.os.extension, ' ') }}
+        env:
+          APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
+          APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
+          APPLE_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
+          APPLE_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
       - name: Publish release
         uses: softprops/action-gh-release@v2

.github/workflows/release.yml

@@ -40,6 +40,15 @@ jobs:
           os: ${{ matrix.os.name }}
           arch: ${{ matrix.arch }}
           extension: ${{ join(matrix.os.extension, ' ') }}
+        env:
+          APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
+          APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
+          APPLE_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
+          APPLE_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.gitignore

@@ -11,6 +11,7 @@ po-*/
 .flatpak-builder/
 
 *.db
+!test/**/*.db
 !integration-tests/db/document.db
 !integration-tests/db/config.ini
 integration-tests/db/log

.prettierignore

@@ -3,3 +3,4 @@
 *.yml
 libraries/*
 docs/*
+src/public/app/doc_notes/**/*

.vscode/extensions.json

@@ -1,3 +1,7 @@
 {
-  "recommendations": ["lokalise.i18n-ally", "editorconfig.editorconfig"]
+  "recommendations": [
+    "lokalise.i18n-ally",
+    "editorconfig.editorconfig",
+    "vitest.explorer"
+  ]
 }

.vscode/settings.json

@@ -19,5 +19,12 @@
   "[css]": {
     "editor.defaultFormatter": "vscode.css-language-features"
   },
-  "npm.exclude": ["**/build", "**/dist", "**/out/**"]
+  "npm.exclude": [
+    "**/build",
+    "**/dist",
+    "**/out/**"
+  ],
+  "[xml]": {
+    "editor.defaultFormatter": "redhat.vscode-xml"
+  }
 }

bin/build-server.sh

@@ -66,8 +66,6 @@ chmod 755 $PKG_DIR/trilium.sh
 cp bin/tpl/anonymize-database.sql $PKG_DIR/
 
 cp -r translations $PKG_DIR/
-cp -r dump-db $PKG_DIR/
-rm -rf $PKG_DIR/dump-db/node_modules
 
 VERSION=`jq -r ".version" package.json`
 

bin/copy-dist.ts

@@ -95,7 +95,6 @@ const copy = async () => {
         "node_modules/mark.js/dist/",
         "node_modules/normalize.css/",
         "node_modules/jquery.fancytree/dist/",
-        "node_modules/bootstrap/dist/",
         "node_modules/autocomplete.js/dist/",
         "node_modules/codemirror/lib/",
         "node_modules/codemirror/addon/",

bin/generate-openapi.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
-import swaggerJsdoc from 'swagger-jsdoc';
+import swaggerJsdoc from "swagger-jsdoc";
 import fs from "fs";
 
 /*
@@ -12,27 +12,29 @@ import fs from "fs";
 
 const options = {
     definition: {
-    openapi: '3.1.1',
+        openapi: "3.1.1",
         info: {
-      title: 'Trilium Notes - Sync server API',
-      version: '0.96.6',
-      description: "This is the internal sync server API used by Trilium Notes / TriliumNext Notes.\n\n_If you're looking for the officially supported External Trilium API, see [here](https://triliumnext.github.io/Docs/Wiki/etapi.html)._\n\nThis page does not yet list all routes. For a full list, see the [route controller](https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/routes.ts).",
+            title: "Trilium Notes - Sync server API",
+            version: "0.96.6",
+            description:
+                "This is the internal sync server API used by Trilium Notes / TriliumNext Notes.\n\n_If you're looking for the officially supported External Trilium API, see [here](https://triliumnext.github.io/Docs/Wiki/etapi.html)._\n\nThis page does not yet list all routes. For a full list, see the [route controller](https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/routes.ts).",
             contact: {
                 name: "TriliumNext issue tracker",
-        url: "https://github.com/TriliumNext/Notes/issues",
+                url: "https://github.com/TriliumNext/Notes/issues"
             },
             license: {
                 name: "GNU Free Documentation License 1.3 (or later)",
-        url: "https://www.gnu.org/licenses/fdl-1.3",
-      },
-    },
+                url: "https://www.gnu.org/licenses/fdl-1.3"
+            }
+        }
     },
     apis: [
         // Put individual files here to have them ordered first.
-    './src/routes/api/setup.ts',
+        "./src/routes/api/setup.ts",
         // all other files
-    './src/routes/api/*.ts', './bin/generate-openapi.js'
-  ],
+        "./src/routes/api/*.ts",
+        "./bin/generate-openapi.js"
+    ]
 };
 
 const openapiSpecification = swaggerJsdoc(options);

bin/release.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export GITHUB_REPO=trilium
+set -e
 
 if [[ $# -eq 0 ]] ; then
     echo "Missing argument of new version"
@@ -40,10 +40,18 @@ TAG=v$VERSION
 
 echo "Committing package.json version change"
 
-git commit -m "release $VERSION"
+git commit -m "chore(release): $VERSION"
 git push
 
 echo "Tagging commit with $TAG"
 
 git tag $TAG
 git push origin $TAG
+
+echo "Updating master"
+
+git fetch
+git checkout master
+git reset --hard origin/master
+git merge origin/develop
+git push

db/migrations/0216__move_content_into_blobs.ts

@@ -1,11 +1,24 @@
-module.exports = () => {
-    const sql = require("../../src/services/sql");
-    const utils = require("../../src/services/utils");
+import sql from "../../src/services/sql";
+import utils from "../../src/services/utils";
 
+interface NoteContentsRow {
+    noteId: string;
+    content: string | Buffer;
+    dateModified: string;
+    utcDateModified: string;
+}
+
+interface NoteRevisionContents {
+    noteRevisionId: string;
+    content: string | Buffer;
+    utcDateModified: string;
+}
+
+export default () => {
     const existingBlobIds = new Set();
 
-    for (const noteId of sql.getColumn(`SELECT noteId FROM note_contents`)) {
-        const row = sql.getRow(`SELECT noteId, content, dateModified, utcDateModified FROM note_contents WHERE noteId = ?`, [noteId]);
+    for (const noteId of sql.getColumn<string>(`SELECT noteId FROM note_contents`)) {
+        const row = sql.getRow<NoteContentsRow>(`SELECT noteId, content, dateModified, utcDateModified FROM note_contents WHERE noteId = ?`, [noteId]);
         const blobId = utils.hashedBlobId(row.content);
 
         if (!existingBlobIds.has(blobId)) {
@@ -28,7 +41,7 @@ module.exports = () => {
     }
 
     for (const noteRevisionId of sql.getColumn(`SELECT noteRevisionId FROM note_revision_contents`)) {
-        const row = sql.getRow(`SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents WHERE noteRevisionId = ?`, [noteRevisionId]);
+        const row = sql.getRow<NoteRevisionContents>(`SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents WHERE noteRevisionId = ?`, [noteRevisionId]);
         const blobId = utils.hashedBlobId(row.content);
 
         if (!existingBlobIds.has(blobId)) {
@@ -44,7 +57,7 @@ module.exports = () => {
             sql.execute("UPDATE entity_changes SET entityName = 'blobs', entityId = ? WHERE entityName = 'note_revision_contents' AND entityId = ?", [blobId, row.noteRevisionId]);
         } else {
             // duplicates
-            sql.execute("DELETE FROM entity_changes WHERE entityName = 'note_revision_contents' AND entityId = ?", [row.noteId]);
+            sql.execute("DELETE FROM entity_changes WHERE entityName = 'note_revision_contents' AND entityId = ?", [row.noteRevisionId]);
         }
 
         sql.execute("UPDATE note_revisions SET blobId = ? WHERE noteRevisionId = ?", [blobId, row.noteRevisionId]);

db/migrations/0220__migrate_images_to_attachments.ts

@@ -1,15 +1,15 @@
-module.exports = () => {
-    const beccaLoader = require("../../src/becca/becca_loader");
-    const becca = require("../../src/becca/becca");
-    const cls = require("../../src/services/cls");
-    const log = require("../../src/services/log");
-    const sql = require("../../src/services/sql");
+import becca from "../../src/becca/becca";
+import becca_loader from "../../src/becca/becca_loader";
+import cls from "../../src/services/cls";
+import log from "../../src/services/log";
+import sql from "../../src/services/sql";
 
+export default () => {
     cls.init(() => {
         // emergency disabling of image compression since it appears to make problems in migration to 0.61
         sql.execute(`UPDATE options SET value = 'false' WHERE name = 'compressImages'`);
 
-        beccaLoader.load();
+        becca_loader.load();
 
         for (const note of Object.values(becca.notes)) {
             try {

e2e/i18n.spec.ts

@@ -11,16 +11,14 @@ test("Displays translation on desktop", async ({ page, context }) => {
     const app = new App(page, context);
     await app.goto();
 
-    await expect(page.locator("#left-pane .quick-search input"))
-        .toHaveAttribute("placeholder", "Quick search");
+    await expect(page.locator("#left-pane .quick-search input")).toHaveAttribute("placeholder", "Quick search");
 });
 
 test("Displays translation on mobile", async ({ page, context }) => {
     const app = new App(page, context);
     await app.goto({ isMobile: true });
 
-    await expect(page.locator("#mobile-sidebar-wrapper .quick-search input"))
-        .toHaveAttribute("placeholder", "Quick search");
+    await expect(page.locator("#mobile-sidebar-wrapper .quick-search input")).toHaveAttribute("placeholder", "Quick search");
 });
 
 test("Displays translations in Settings", async ({ page, context }) => {
@@ -44,14 +42,16 @@ test("User can change language from settings", async ({ page, context }) => {
 
     // Check that the default value (English) is set.
     await expect(app.currentNoteSplit).toContainText("Theme");
-    const languageCombobox = await app.currentNoteSplit.getByRole("combobox").first();
+    const languageCombobox = app.currentNoteSplit.getByRole("combobox").first();
     await expect(languageCombobox).toHaveValue("en");
 
     // Select Chinese and ensure the translation is set.
     await languageCombobox.selectOption("cn");
     await expect(app.currentNoteSplit).toContainText("主题", { timeout: 15000 });
+    await expect(languageCombobox).toHaveValue("cn");
 
     // Select English again.
     await languageCombobox.selectOption("en");
     await expect(app.currentNoteSplit).toContainText("Language", { timeout: 15000 });
+    await expect(languageCombobox).toHaveValue("en");
 });

e2e/layout/tab_bar.spec.ts

@@ -19,13 +19,13 @@ test("Can drag tabs around", async ({ page, context }) => {
     let tab = app.getTab(0);
 
     // Drag the first tab at the end
-    await tab.dragTo(app.getTab(2), { targetPosition: { x: 50, y: 0 }});
+    await tab.dragTo(app.getTab(2), { targetPosition: { x: 50, y: 0 } });
 
     tab = app.getTab(2);
     await expect(tab).toContainText(NOTE_TITLE);
 
     // Drag the tab to the left
-    await tab.dragTo(app.getTab(0), { targetPosition: { x: 50, y: 0 }});
+    await tab.dragTo(app.getTab(0), { targetPosition: { x: 50, y: 0 } });
     await expect(app.getTab(0)).toContainText(NOTE_TITLE);
 });
 

e2e/note_types/code.spec.ts

@@ -39,7 +39,9 @@ test("Displays lint errors for backend script", async ({ page, context }) => {
 });
 
 async function expectTooltip(page: Page, tooltip: string) {
-    await expect(page.locator(".CodeMirror-lint-tooltip:visible", {
-        "hasText": tooltip
-    })).toBeVisible();
+    await expect(
+        page.locator(".CodeMirror-lint-tooltip:visible", {
+            hasText: tooltip
+        })
+    ).toBeVisible();
 }

e2e/note_types/mermaid.spec.ts

@@ -3,7 +3,8 @@ import App from "../support/app";
 
 test("renders ELK flowchart", async ({ page, context }) => {
     await testAriaSnapshot({
-        page, context,
+        page,
+        context,
         noteTitle: "Flowchart ELK on",
         snapshot: `
             - document:
@@ -22,12 +23,13 @@ test("renders ELK flowchart", async ({ page, context }) => {
                 - paragraph: Guarantee
                 - text: Interfaces for B
         `
-    })
+    });
 });
 
 test("renders standard flowchart", async ({ page, context }) => {
     await testAriaSnapshot({
-        page, context,
+        page,
+        context,
         noteTitle: "Flowchart ELK off",
         snapshot: `
             - document:
@@ -46,7 +48,7 @@ test("renders standard flowchart", async ({ page, context }) => {
                 - paragraph: C
                 - text: Interfaces for B
         `
-    })
+    });
 });
 
 interface AriaTestOpts {

e2e/note_types/text.spec.ts

@@ -44,8 +44,8 @@ test("Highlights list is displayed", async ({ page, context }) => {
 
     await expect(app.sidebar).toContainText("Highlights List");
     const rootList = app.sidebar.locator(".highlights-list ol");
-    let index=0;
-    for (const highlightedEl of [ "Bold 1", "Italic 1", "Underline 1", "Colored text 1", "Background text 1", "Bold 2", "Italic 2", "Underline 2", "Colored text 2", "Background text 2" ]) {
+    let index = 0;
+    for (const highlightedEl of ["Bold 1", "Italic 1", "Underline 1", "Colored text 1", "Background text 1", "Bold 2", "Italic 2", "Underline 2", "Colored text 2", "Background text 2"]) {
         await expect(rootList.locator("li").nth(index++)).toContainText(highlightedEl);
     }
 });
@@ -54,7 +54,7 @@ test("Displays math popup", async ({ page, context }) => {
     const app = new App(page, context);
     await app.goto();
     await app.goToNoteInNewTab("Empty text");
-    const noteContent = app.currentNoteSplit.locator(".note-detail-editable-text-editor")
+    const noteContent = app.currentNoteSplit.locator(".note-detail-editable-text-editor");
     await noteContent.fill("Hello world");
     await noteContent.press("ControlOrMeta+M");
 

e2e/support/app.ts

@@ -25,7 +25,7 @@ export default class App {
         this.tabBar = page.locator(".tab-row-widget-container");
         this.noteTree = page.locator(".tree-wrapper");
         this.launcherBar = page.locator("#launcher-container");
-        this.currentNoteSplit = page.locator(".note-split:not(.hidden-ext)")
+        this.currentNoteSplit = page.locator(".note-split:not(.hidden-ext)");
         this.sidebar = page.locator("#right-pane");
     }
 
@@ -42,12 +42,11 @@ export default class App {
             url = "/";
         }
 
-        await this.page.goto(url, { waitUntil: "networkidle" });
+        await this.page.goto(url, { waitUntil: "networkidle", timeout: 30_000 });
 
         // Wait for the page to load.
         if (url === "/") {
-            await expect(this.page.locator(".tree"))
-                .toContainText("Trilium Integration Test");
+            await expect(this.page.locator(".tree")).toContainText("Trilium Integration Test");
             await this.closeAllTabs();
         }
     }
@@ -109,11 +108,12 @@ export default class App {
         });
 
         expect(csrfToken).toBeTruthy();
-        await expect(await this.page.request.put(`${BASE_URL}/api/options/${key}/${value}`, {
+        await expect(
+            await this.page.request.put(`${BASE_URL}/api/options/${key}/${value}`, {
                 headers: {
                     "x-csrf-token": csrfToken
                 }
-        })).toBeOK();
+            })
+        ).toBeOK();
     }
-
 }

electron-docs-main.ts

@@ -0,0 +1,26 @@
+import cls from "./src/services/cls.js";
+import sql_init from "./src/services/sql_init.js";
+
+async function startElectron() {
+    await import("./electron-main.js");
+}
+
+async function initializeDb() {
+    return new Promise<void>((resolve) => {
+        cls.init(async () => {
+            await sql_init.createInitialDatabase();
+            sql_init.setDbAsInitialized();
+            resolve();
+        });
+    })
+}
+
+async function main() {
+    if (!sql_init.isDbInitialized()) {
+        initializeDb();
+    }
+
+    await startElectron();
+}
+
+await main();

entitlements.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+  </dict>
+</plist>

eslint.config.js

@@ -0,0 +1,43 @@
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    tseslint.configs.recommended,
+    // consider using rules below, once we have a full TS codebase and can be more strict
+    // tseslint.configs.strictTypeChecked,
+    // tseslint.configs.stylisticTypeChecked,
+    // tseslint.configs.recommendedTypeChecked,
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname
+            }
+        }
+    },
+    {
+        rules: {
+            // add rule overrides here
+            "no-undef": "off",
+            "no-unused-vars": "off",
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    "argsIgnorePattern": "^_",
+                    "varsIgnorePattern": "^_",
+                }
+            ]
+        }
+    },
+    {
+        ignores: [
+            "build/*",
+            "dist/*",
+            "docs/*",
+            "libraries/*",
+            "src/public/app-dist/*",
+            "src/public/app/doc_notes/*"
+        ]
+    }
+);

forge.config.cjs

@@ -17,34 +17,40 @@ module.exports = {
         overwrite: true,
         asar: true,
         icon: "./images/app-icons/icon",
+        osxSign: {},
+        osxNotarize: {
+            appleId: process.env.APPLE_ID,
+            appleIdPassword: process.env.APPLE_ID_PASSWORD,
+            teamId: process.env.APPLE_TEAM_ID
+        },
         extraResource: [
-            // Moved to root
-            ...extraResourcesForPlatform,
+            // All resources should stay in Resources directory for macOS
+            ...(process.platform === "darwin" ? [] : extraResourcesForPlatform),
 
-            // Moved to resources (TriliumNext Notes.app/Contents/Resources on macOS)
+            // These always go in Resources
             "translations/",
             "node_modules/@highlightjs/cdn-assets/styles"
         ],
         afterComplete: [
             (buildPath, _electronVersion, platform, _arch, callback) => {
+                // Only move resources on non-macOS platforms
+                if (platform !== "darwin") {
                     for (const resource of extraResourcesForPlatform) {
                         const baseName = path.basename(resource);
-
-                    // prettier-ignore
-                    const sourcePath = (platform === "darwin")
-                        ? path.join(buildPath, `${APP_NAME}.app`, "Contents", "Resources", baseName)
-                        : path.join(buildPath, "resources", baseName);
+                        const sourcePath = path.join(buildPath, "resources", baseName);
 
                         // prettier-ignore
                         const destPath = (baseName !== "256x256.png")
                             ? path.join(buildPath, baseName)
                             : path.join(buildPath, "icon.png");
 
-                    // Copy files from resources folder to root
                         fs.move(sourcePath, destPath)
                             .then(() => callback())
                             .catch((err) => callback(err));
                     }
+                } else {
+                    callback();
+                }
             }
         ]
     },

integration-tests/db/config.ini

@@ -6,7 +6,7 @@ instanceName=
 noAuthentication=true
 
 # set to true to disable backups (e.g. because of limited space on server)
-noBackup=false
+noBackup=true
 
 # Disable automatically generating desktop icon
 # noDesktopIcon=true

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "TriliumNext Notes",
   "description": "Build your personal knowledge base with TriliumNext Notes",
-  "version": "0.92.2-beta",
+  "version": "0.92.3-beta",
   "license": "AGPL-3.0-only",
   "main": "./dist/electron-main.js",
   "author": {
@@ -28,14 +28,15 @@
     "server:switch": "rimraf ./node_modules/better-sqlite3 && npm install",
     "electron:start": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./electron-main.ts --inspect=5858 .",
     "electron:start-no-dir": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev electron --inspect=5858 .",
-    "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
+    "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_34 --run \"electron ./electron-main.ts --inspect=5858 .\"",
     "electron:start-nix-no-dir": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
-    "electron:start-prod": "npm run build:prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .",
-    "electron:start-prod-no-dir": "npm run build:prepare-dist && cross-env TRILIUM_ENV=dev electron --inspect=5858 .",
+    "electron:start-prod": "npm run build:prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=prod electron ./dist/electron-main.js --inspect=5858 .",
+    "electron:start-prod-no-dir": "npm run build:prepare-dist && cross-env TRILIUM_ENV=prod electron --inspect=5858 .",
     "electron:start-prod-nix": "electron-rebuild --version 33.3.1 && npm run build:prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
     "electron:start-prod-nix-no-dir": "electron-rebuild --version 33.3.1 && npm run build:prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
     "electron:qstart": "npm run electron:switch && npm run electron:start",
     "electron:switch": "electron-rebuild",
+    "docs:edit": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-docs TRILIUM_ENV=dev electron ./electron-docs-main.ts .",
     "electron-forge:start": "npm run build:prepare-dist && electron-forge start",
     "electron-forge:make": "npm run build:prepare-dist && electron-forge make",
     "electron-forge:package": "npm run build:prepare-dist && electron-forge package",
@@ -44,15 +45,20 @@
     "docs:build": "npm run docs:build-backend && npm run docs:build-frontend",
     "build:webpack": "tsx node_modules/webpack/bin/webpack.js -c webpack.config.ts",
     "build:prepare-dist": "npm run build:webpack && rimraf ./dist && tsc && tsx ./bin/copy-dist.ts",
-    "test": "cross-env TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest",
-    "test:coverage": "cross-env TRILIUM_DATA_DIR=./integration-tests/db vitest --coverage",
-    "test:playwright": "playwright test",
+    "test": "npm run client:test && npm run server:test",
+    "server:test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest",
+    "server:coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --coverage",
+    "client:test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --root src/public/app",
+    "client:coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --root src/public/app --coverage",
+    "test:playwright": "playwright test --workers 1",
     "test:integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
     "test:integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
     "test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
     "dev:watch-dist": "tsx ./bin/watch-dist.ts",
     "dev:prettier-check": "prettier . --check",
     "dev:prettier-fix": "prettier . --write",
+    "dev:linter-check": "eslint .",
+    "dev:linter-fix": "eslint . --fix",
     "chore:update-build-info": "tsx bin/update-build-info.ts",
     "chore:ci-update-nightly-version": "tsx ./bin/update-nightly-version.ts",
     "chore:generate-document": "cross-env nodemon ./bin/generate_document.ts 1000",
@@ -70,18 +76,13 @@
     "@mermaid-js/layout-elk": "0.1.7",
     "@mind-elixir/node-menu": "1.0.4",
     "@triliumnext/express-partial-content": "1.0.1",
-    "@types/js-yaml": "4.0.9",
-    "@types/leaflet": "1.9.16",
-    "@types/react-dom": "18.3.5",
-    "@types/swagger-ui-express": "4.1.8",
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
     "autocomplete.js": "0.38.1",
-    "axios": "1.7.9",
+    "axios": "1.8.2",
     "better-sqlite3": "11.8.1",
-    "bootstrap": "5.3.3",
     "boxicons": "2.1.4",
-    "chardet": "2.0.0",
+    "chardet": "2.1.0",
     "cheerio": "1.0.0",
     "chokidar": "4.0.3",
     "cls-hooked": "4.2.2",
@@ -102,7 +103,7 @@
     "express": "4.21.2",
     "express-rate-limit": "7.5.0",
     "express-session": "1.18.1",
-    "force-graph": "1.49.0",
+    "force-graph": "1.49.3",
     "fs-extra": "11.3.0",
     "helmet": "8.0.0",
     "html": "1.0.0",
@@ -111,7 +112,6 @@
     "https-proxy-agent": "7.0.6",
     "i18next": "24.2.2",
     "i18next-fs-backend": "2.6.0",
-    "i18next-http-backend": "3.0.2",
     "image-type": "5.2.0",
     "ini": "5.0.0",
     "is-animated": "2.0.2",
@@ -124,14 +124,13 @@
     "jsdom": "26.0.0",
     "jsplumb": "2.15.6",
     "katex": "0.16.21",
-    "knockout": "3.5.1",
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.1.2",
     "mark.js": "8.11.1",
     "marked": "15.0.7",
     "mermaid": "11.4.1",
     "mime-types": "2.1.35",
-    "mind-elixir": "4.3.7",
+    "mind-elixir": "4.4.1",
     "multer": "1.4.5-lts.1",
     "normalize-strings": "1.1.1",
     "normalize.css": "8.0.1",
@@ -146,13 +145,11 @@
     "serve-favicon": "2.5.0",
     "session-file-store": "1.5.0",
     "source-map-support": "0.5.21",
-    "split.js": "1.6.5",
     "stream-throttle": "0.1.3",
     "strip-bom": "5.0.0",
     "striptags": "3.2.0",
     "swagger-ui-express": "5.0.1",
     "tmp": "0.2.3",
-    "ts-loader": "9.5.2",
     "turndown": "7.2.0",
     "unescape": "1.0.1",
     "vanilla-js-wheel-zoom": "9.0.4",
@@ -170,7 +167,9 @@
     "@electron-forge/maker-zip": "7.7.0",
     "@electron-forge/plugin-auto-unpack-natives": "7.7.0",
     "@electron/rebuild": "3.7.1",
-    "@playwright/test": "1.50.1",
+    "@eslint/js": "9.21.0",
+    "@playwright/test": "1.51.0",
+    "@popperjs/core": "2.11.8",
     "@types/archiver": "6.0.3",
     "@types/better-sqlite3": "7.6.12",
     "@types/bootstrap": "5.2.10",
@@ -188,12 +187,15 @@
     "@types/html": "1.0.4",
     "@types/ini": "4.1.1",
     "@types/jquery": "3.5.32",
+    "@types/js-yaml": "4.0.9",
     "@types/jsdom": "21.1.7",
+    "@types/leaflet": "1.9.16",
     "@types/leaflet-gpx": "1.3.7",
     "@types/mime-types": "2.1.4",
     "@types/multer": "1.4.12",
-    "@types/node": "22.13.5",
+    "@types/node": "22.13.9",
     "@types/react": "18.3.18",
+    "@types/react-dom": "18.3.5",
     "@types/safe-compare": "1.1.2",
     "@types/sanitize-html": "2.13.0",
     "@types/sax": "1.2.7",
@@ -201,27 +203,44 @@
     "@types/session-file-store": "1.2.5",
     "@types/source-map-support": "0.5.10",
     "@types/stream-throttle": "0.1.4",
+    "@types/supertest": "6.0.2",
+    "@types/swagger-ui-express": "4.1.8",
     "@types/tmp": "0.2.6",
     "@types/turndown": "5.0.5",
-    "@types/ws": "8.5.14",
+    "@types/ws": "8.18.0",
     "@types/xml2js": "0.4.14",
     "@types/yargs": "17.0.33",
-    "@vitest/coverage-v8": "3.0.6",
+    "@vitest/coverage-v8": "3.0.8",
+    "autoprefixer": "10.4.20",
+    "bootstrap": "5.3.3",
     "cross-env": "7.0.3",
-    "electron": "34.2.0",
+    "css-loader": "7.1.2",
+    "electron": "34.3.1",
+    "eslint": "9.21.0",
     "esm": "3.2.25",
+    "happy-dom": "17.3.0",
+    "i18next-http-backend": "3.0.2",
     "jsdoc": "4.0.4",
+    "knockout": "3.5.1",
     "lorem-ipsum": "2.0.8",
+    "mini-css-extract-plugin": "2.9.2",
     "nodemon": "3.1.9",
-    "prettier": "3.5.1",
+    "postcss-loader": "8.1.1",
+    "prettier": "3.5.3",
     "rcedit": "4.0.1",
     "rimraf": "6.0.1",
+    "sass": "1.85.1",
+    "sass-loader": "16.0.5",
+    "split.js": "1.6.5",
+    "supertest": "7.0.0",
     "swagger-jsdoc": "6.2.8",
+    "ts-loader": "9.5.2",
     "tslib": "2.8.1",
     "tsx": "4.19.3",
-    "typedoc": "0.27.8",
-    "typescript": "5.7.3",
-    "vitest": "3.0.6",
+    "typedoc": "0.27.9",
+    "typescript": "5.8.2",
+    "typescript-eslint": "8.26.0",
+    "vitest": "3.0.8",
     "webpack": "5.98.0",
     "webpack-cli": "6.0.1",
     "webpack-dev-middleware": "7.4.2"

playwright.config.ts

@@ -1,6 +1,6 @@
-import { defineConfig, devices } from '@playwright/test';
+import { defineConfig, devices } from "@playwright/test";
 
-const SERVER_URL = 'http://127.0.0.1:8082';
+const SERVER_URL = "http://127.0.0.1:8082";
 
 /**
  * Read environment variables from file.
@@ -14,7 +14,7 @@ const SERVER_URL = 'http://127.0.0.1:8082';
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  testDir: './e2e',
+    testDir: "./e2e",
     /* Run tests in files in parallel */
     fullyParallel: true,
     /* Fail the build on CI if you accidentally left test.only in the source code. */
@@ -24,22 +24,22 @@ export default defineConfig({
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 1 : undefined,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
+    reporter: "html",
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */
         baseURL: SERVER_URL,
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
+        trace: "on-first-retry"
     },
 
     /* Configure projects for major browsers */
     projects: [
         {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
+            name: "chromium",
+            use: { ...devices["Desktop Chrome"] }
+        }
 
         // {
         //   name: 'firefox',
@@ -73,9 +73,11 @@ export default defineConfig({
     ],
 
     /* Run your local dev server before starting the tests */
-  webServer: !process.env.TRILIUM_DOCKER ? {
-    command: 'npm run test:integration-mem-db-dev',
+    webServer: !process.env.TRILIUM_DOCKER
+        ? {
+              command: "npm run test:integration-mem-db-dev",
               url: SERVER_URL,
-    reuseExistingServer: !process.env.CI,
-  } : undefined,
+              reuseExistingServer: !process.env.CI
+          }
+        : undefined
 });

src/becca/entities/rows.ts

@@ -1,4 +1,5 @@
 // TODO: Booleans should probably be numbers instead (as SQLite does not have booleans.);
+// TODO: check against schema.sql which properties really are "optional"
 
 export interface AttachmentRow {
     attachmentId?: string;
@@ -12,6 +13,8 @@ export interface AttachmentRow {
     dateModified?: string;
     utcDateModified?: string;
     utcDateScheduledForErasureSince?: string;
+    isDeleted?: boolean;
+    deleteId?: string;
     contentLength?: number;
     content?: Buffer | string;
 }

src/public/app/components/app_context.ts

@@ -18,13 +18,13 @@ import type NoteDetailWidget from "../widgets/note_detail.js";
 import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import type { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
-import type { Node } from "../services/tree.js";
 import type LoadResults from "../services/load_results.js";
 import type { Attribute } from "../services/attribute_parser.js";
 import type NoteTreeWidget from "../widgets/note_tree.js";
 import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js";
 import type { ContextMenuEvent } from "../menus/context_menu.js";
 import type TypeWidget from "../widgets/type_widgets/type_widget.js";
+import type EditableTextTypeWidget from "../widgets/type_widgets/editable_text.js";
 
 interface Layout {
     getRootWidget: (appContext: AppContext) => RootWidget;
@@ -49,21 +49,21 @@ export interface CommandData {
  * Represents a set of commands that are triggered from the context menu, providing information such as the selected note.
  */
 export interface ContextMenuCommandData extends CommandData {
-    node: Node;
-    notePath: string;
+    node: Fancytree.FancytreeNode;
+    notePath?: string;
     noteId?: string;
-    selectedOrActiveBranchIds: any; // TODO: Remove any once type is defined
+    selectedOrActiveBranchIds?: any; // TODO: Remove any once type is defined
     selectedOrActiveNoteIds: any; // TODO: Remove  any once type is defined
 }
 
 export interface NoteCommandData extends CommandData {
-    notePath: string;
+    notePath?: string;
     hoistedNoteId?: string;
     viewScope?: ViewScope;
 }
 
 export interface ExecuteCommandData<T> extends CommandData {
-    resolve: (data: T) => void
+    resolve: (data: T) => void;
 }
 
 /**
@@ -71,7 +71,8 @@ export interface ExecuteCommandData<T> extends CommandData {
  */
 export type CommandMappings = {
     "api-log-messages": CommandData;
-    focusTree: CommandData,
+    focusTree: CommandData;
+    focusOnTitle: CommandData;
     focusOnDetail: CommandData;
     focusOnSearchDefinition: Required<CommandData>;
     searchNotes: CommandData & {
@@ -79,6 +80,7 @@ export type CommandMappings = {
         ancestorNoteId?: string | null;
     };
     closeTocCommand: CommandData;
+    closeHlt: CommandData;
     showLaunchBarSubtree: CommandData;
     showRevisions: CommandData;
     showOptions: CommandData & {
@@ -106,13 +108,18 @@ export type CommandMappings = {
     showPromptDialog: PromptDialogOptions;
     showInfoDialog: ConfirmWithMessageOptions;
     showConfirmDialog: ConfirmWithMessageOptions;
+    showRecentChanges: CommandData & { ancestorNoteId: string };
+    showImportDialog: CommandData & { noteId: string };
     openNewNoteSplit: NoteCommandData;
     openInWindow: NoteCommandData;
     openNoteInNewTab: CommandData;
     openNoteInNewSplit: CommandData;
     openNoteInNewWindow: CommandData;
+    openAboutDialog: CommandData;
+    hideFloatingButtons: {};
     hideLeftPane: CommandData;
     showLeftPane: CommandData;
+    hoistNote: CommandData & { noteId: string };
     leaveProtectedSession: CommandData;
     enterProtectedSession: CommandData;
 
@@ -122,9 +129,14 @@ export type CommandMappings = {
     insertNoteAfter: ContextMenuCommandData;
     insertChildNote: ContextMenuCommandData;
     delete: ContextMenuCommandData;
+    editNoteTitle: ContextMenuCommandData;
     protectSubtree: ContextMenuCommandData;
     unprotectSubtree: ContextMenuCommandData;
-    openBulkActionsDialog: ContextMenuCommandData;
+    openBulkActionsDialog:
+    | ContextMenuCommandData
+    | {
+        selectedOrActiveNoteIds?: string[];
+    };
     editBranchPrefix: ContextMenuCommandData;
     convertNoteToAttachment: ContextMenuCommandData;
     duplicateSubtree: ContextMenuCommandData;
@@ -143,6 +155,11 @@ export type CommandMappings = {
     importIntoNote: ContextMenuCommandData;
     exportNote: ContextMenuCommandData;
     searchInSubtree: ContextMenuCommandData;
+    moveNoteUp: ContextMenuCommandData;
+    moveNoteDown: ContextMenuCommandData;
+    moveNoteUpInHierarchy: ContextMenuCommandData;
+    moveNoteDownInHierarchy: ContextMenuCommandData;
+    selectAllNotesInParent: ContextMenuCommandData;
 
     addNoteLauncher: ContextMenuCommandData;
     addScriptLauncher: ContextMenuCommandData;
@@ -175,6 +192,7 @@ export type CommandMappings = {
     importMarkdownInline: CommandData;
     showPasswordNotSet: CommandData;
     showProtectedSessionPasswordDialog: CommandData;
+    showUploadAttachmentsDialog: CommandData & { noteId: string };
     closeProtectedSessionPasswordDialog: CommandData;
     copyImageReferenceToClipboard: CommandData;
     copyImageToClipboard: CommandData;
@@ -198,6 +216,7 @@ export type CommandMappings = {
         screen: Screen;
     };
     closeTab: CommandData;
+    closeToc: CommandData;
     closeOtherTabs: CommandData;
     closeRightTabs: CommandData;
     closeAllTabs: CommandData;
@@ -205,26 +224,34 @@ export type CommandMappings = {
     moveTabToNewWindow: CommandData;
     copyTabToNewWindow: CommandData;
     closeActiveTab: CommandData & {
-        $el: JQuery<HTMLElement>
-    },
+        $el: JQuery<HTMLElement>;
+    };
     setZoomFactorAndSave: {
         zoomFactor: string;
-    }
+    };
 
     reEvaluateRightPaneVisibility: CommandData;
     runActiveNote: CommandData;
     scrollContainerToCommand: CommandData & {
         position: number;
     };
-    moveThisNoteSplit: CommandData & {
-        isMovingLeft: boolean;
-    };
+    scrollToEnd: CommandData;
+    closeThisNoteSplit: CommandData;
+    moveThisNoteSplit: CommandData & { isMovingLeft: boolean };
 
     // Geomap
-    deleteFromMap: { noteId: string },
-    openGeoLocation: { noteId: string, event: JQuery.MouseDownEvent }
+    deleteFromMap: { noteId: string };
+    openGeoLocation: { noteId: string; event: JQuery.MouseDownEvent };
 
     toggleZenMode: CommandData;
+
+    updateAttributeList: CommandData & { attributes: Attribute[] };
+    saveAttributes: CommandData;
+    reloadAttributes: CommandData;
+    refreshNoteList: CommandData & { noteId: string };
+
+    refreshResults: {};
+    refreshSearchDefinition: {};
 };
 
 type EventMappings = {
@@ -288,6 +315,13 @@ type EventMappings = {
     showHighlightsListWidget: {
         noteId: string;
     };
+    showTocWidget: {
+        noteId: string;
+    };
+    showSearchError: {
+        error: string;
+    };
+    searchRefreshed: { ntxId?: string | null };
     hoistedNoteChanged: {
         noteId: string;
         ntxId: string | null;
@@ -317,17 +351,23 @@ type EventMappings = {
         ntxId: string | null | undefined; // TODO: deduplicate ntxId
     };
     tabReorder: {
-        ntxIdsInOrder: string[]
+        ntxIdsInOrder: string[];
     };
     refreshNoteList: {
         noteId: string;
     };
-    showToc: {
-        noteId: string;
-    };
-    scrollToEnd: { ntxId: string };
     noteTypeMimeChanged: { noteId: string };
     zenModeChanged: { isEnabled: boolean };
+    relationMapCreateChildNote: { ntxId: string | null | undefined };
+    relationMapResetPanZoom: { ntxId: string | null | undefined };
+    relationMapResetZoomIn: { ntxId: string | null | undefined };
+    relationMapResetZoomOut: { ntxId: string | null | undefined };
+    activeNoteChangedEvent: {};
+    showAddLinkDialog: {
+        textTypeWidget: EditableTextTypeWidget;
+        text: string;
+    };
+
 };
 
 export type EventListener<T extends EventNames> = {
@@ -365,6 +405,8 @@ class AppContext extends Component {
     layout?: Layout;
     noteTreeWidget?: NoteTreeWidget;
 
+    lastSearchString?: string;
+
     constructor(isMainWindow: boolean) {
         super();
 
@@ -509,10 +551,12 @@ $(window).on("beforeunload", () => {
 });
 
 $(window).on("hashchange", function () {
-    const { notePath, ntxId, viewScope } = linkService.parseNavigationStateFromUrl(window.location.href);
+    const { notePath, ntxId, viewScope, searchString } = linkService.parseNavigationStateFromUrl(window.location.href);
 
     if (notePath || ntxId) {
         appContext.tabManager.switchToNoteContext(ntxId, notePath, viewScope);
+    } else if (searchString) {
+        appContext.triggerCommand("searchNotes", { searchString });
     }
 });
 

src/public/app/components/component.ts

@@ -18,7 +18,7 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
     children: ChildT[];
     initialized: Promise<void> | null;
     parent?: TypedComponent<any>;
-    position!: number;
+    _position!: number;
 
     constructor() {
         this.componentId = `${this.sanitizedClassName}-${utils.randomString(8)}`;
@@ -31,6 +31,14 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
         return this.constructor.name.replace(/[^A-Z0-9]/gi, "_");
     }
 
+    get position() {
+        return this._position;
+    }
+
+    set position(newPosition: number) {
+        this._position = newPosition;
+    }
+
     setParent(parent: TypedComponent<any>) {
         this.parent = parent;
         return this;
@@ -80,8 +88,7 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
         return promises.length > 0 ? Promise.all(promises) : null;
     }
 
-    triggerCommand<K extends CommandNames>(name: string, _data?: CommandMappings[K]): Promise<unknown> | undefined | null {
-        const data = _data || {};
+    triggerCommand<K extends CommandNames>(name: K, data?: CommandMappings[K]): Promise<unknown> | undefined | null {
         const fun = (this as any)[`${name}Command`];
 
         if (fun) {

src/public/app/components/note_context.ts

@@ -11,7 +11,7 @@ import type { ViewScope } from "../services/link.js";
 import type FNote from "../entities/fnote.js";
 import type TypeWidget from "../widgets/type_widgets/type_widget.js";
 
-interface SetNoteOpts {
+export interface SetNoteOpts {
     triggerSwitchEvent?: unknown;
     viewScope?: ViewScope;
 }
@@ -369,7 +369,8 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
         const { note, viewScope } = this;
 
-        let title = viewScope?.viewMode === "default" ? note.title : `${note.title}: ${viewScope?.viewMode}`;
+        const isNormalView = (viewScope?.viewMode === "default" || viewScope?.viewMode === "contextual-help");
+        let title = (isNormalView ? note.title : `${note.title}: ${viewScope?.viewMode}`);
 
         if (viewScope?.attachmentId) {
             // assuming the attachment has been already loaded

src/public/app/components/shortcut_component.ts

@@ -17,7 +17,7 @@ export default class ShortcutComponent extends Component implements EventListene
     }
 
     bindNoteShortcutHandler(labelOrRow: AttributeRow) {
-        const handler = () => appContext.tabManager.getActiveContext().setNote(labelOrRow.noteId);
+        const handler = () => appContext.tabManager.getActiveContext()?.setNote(labelOrRow.noteId);
         const namespace = labelOrRow.attributeId;
 
         if (labelOrRow.isDeleted) {

src/public/app/components/tab_manager.js

@@ -248,7 +248,7 @@ export default class TabManager extends Component {
         await noteContext.setEmpty();
     }
 
-    async openEmptyTab(ntxId = null, hoistedNoteId = "root", mainNtxId = null) {
+    async openEmptyTab(ntxId = null, hoistedNoteId = "root", mainNtxId) {
         const noteContext = new NoteContext(ntxId, hoistedNoteId, mainNtxId);
 
         const existingNoteContext = this.children.find((nc) => nc.ntxId === noteContext.ntxId);

src/public/app/desktop.ts

@@ -10,6 +10,7 @@ import { t } from "./services/i18n.js";
 import options from "./services/options.js";
 import type ElectronRemote from "@electron/remote";
 import type Electron from "electron";
+import "../stylesheets/bootstrap.scss";
 
 await appContext.earlyInit();
 

src/public/app/doc_notes/en/User Guide/!!!meta.json

@@ -1,6 +1,6 @@
 {
 	"formatVersion": 2,
-	"appVersion": "0.92.0-beta",
+	"appVersion": "0.92.2-beta",
 	"files": [
 		{
 			"isClone": false,
@@ -34,7 +34,7 @@
 						"OkOZllzB3fqN",
 						"yoAe4jV2yzbd"
 					],
-					"title": "Features",
+					"title": "New Features",
 					"notePosition": 40,
 					"prefix": null,
 					"isExpanded": false,
@@ -47,53 +47,91 @@
 							"value": "bx bx-star",
 							"isInheritable": false,
 							"position": 10
+						},
+						{
+							"type": "label",
+							"name": "sorted",
+							"value": "dateCreated",
+							"isInheritable": false,
+							"position": 20
+						},
+						{
+							"type": "label",
+							"name": "sortDirection",
+							"value": "desc",
+							"isInheritable": false,
+							"position": 30
 						}
 					],
 					"format": "html",
 					"attachments": [],
-					"dirFileName": "Features",
+					"dirFileName": "New Features",
 					"children": [
 						{
 							"isClone": false,
-							"noteId": "13D1lOc9sqmZ",
+							"noteId": "3I277VKYxWDH",
 							"notePath": [
 								"OkOZllzB3fqN",
 								"yoAe4jV2yzbd",
-								"13D1lOc9sqmZ"
+								"3I277VKYxWDH"
 							],
-							"title": "Export as PDF",
-							"notePosition": 20,
+							"title": "Right-to-left text notes",
+							"notePosition": 10,
 							"prefix": null,
 							"isExpanded": false,
 							"type": "text",
 							"mime": "text/html",
-							"attributes": [],
+							"attributes": [
+								{
+									"type": "label",
+									"name": "iconClass",
+									"value": "bx bx-align-right",
+									"isInheritable": false,
+									"position": 10
+								}
+							],
 							"format": "html",
-							"dataFileName": "Export as PDF.html",
+							"dataFileName": "Right-to-left text notes.html",
 							"attachments": [
 								{
-									"attachmentId": "xsGM34t8ssKV",
+									"attachmentId": "PSBNAvDyj5Vy",
 									"title": "image.png",
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "Export as PDF_image.png"
+									"dataFileName": "Right-to-left text notes_i.png"
 								},
 								{
-									"attachmentId": "cvyes4f1Vhmm",
+									"attachmentId": "YXYIJznak915",
 									"title": "image.png",
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "1_Export as PDF_image.png"
+									"dataFileName": "1_Right-to-left text notes_i.png"
 								},
 								{
-									"attachmentId": "b3v1pLE6TF1Y",
+									"attachmentId": "Do0S17lDl7uu",
 									"title": "image.png",
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "2_Export as PDF_image.png"
+									"dataFileName": "2_Right-to-left text notes_i.png"
+								},
+								{
+									"attachmentId": "D3lyhPvPvocb",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/png",
+									"position": 10,
+									"dataFileName": "3_Right-to-left text notes_i.png"
+								},
+								{
+									"attachmentId": "Tu7llk3GgRkA",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/png",
+									"position": 10,
+									"dataFileName": "4_Right-to-left text notes_i.png"
 								}
 							]
 						},
@@ -106,12 +144,20 @@
 								"B3YLYM4erjnW"
 							],
 							"title": "Zen mode",
-							"notePosition": 30,
+							"notePosition": 20,
 							"prefix": null,
 							"isExpanded": false,
 							"type": "text",
 							"mime": "text/html",
-							"attributes": [],
+							"attributes": [
+								{
+									"type": "label",
+									"name": "iconClass",
+									"value": "bx bxs-yin-yang",
+									"isInheritable": false,
+									"position": 10
+								}
+							],
 							"format": "html",
 							"dataFileName": "Zen mode.html",
 							"attachments": [
@@ -180,6 +226,50 @@
 									"dataFileName": "7_Zen mode_image.png"
 								}
 							]
+						},
+						{
+							"isClone": false,
+							"noteId": "13D1lOc9sqmZ",
+							"notePath": [
+								"OkOZllzB3fqN",
+								"yoAe4jV2yzbd",
+								"13D1lOc9sqmZ"
+							],
+							"title": "Export as PDF",
+							"notePosition": 30,
+							"prefix": null,
+							"isExpanded": false,
+							"type": "text",
+							"mime": "text/html",
+							"attributes": [
+								{
+									"type": "label",
+									"name": "iconClass",
+									"value": "bx bxs-file-pdf",
+									"isInheritable": false,
+									"position": 30
+								}
+							],
+							"format": "html",
+							"dataFileName": "Export as PDF.html",
+							"attachments": [
+								{
+									"attachmentId": "xsGM34t8ssKV",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/png",
+									"position": 10,
+									"dataFileName": "Export as PDF_image.png"
+								},
+								{
+									"attachmentId": "b3v1pLE6TF1Y",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/png",
+									"position": 10,
+									"dataFileName": "1_Export as PDF_image.png"
+								}
+							]
 						}
 					]
 				},
@@ -233,8 +323,47 @@
 								}
 							],
 							"format": "html",
-							"dataFileName": "Text.html",
-							"attachments": []
+							"attachments": [],
+							"dirFileName": "Text",
+							"children": [
+								{
+									"isClone": false,
+									"noteId": "B0lcI9xz1r8K",
+									"notePath": [
+										"OkOZllzB3fqN",
+										"wmegHv51MJMd",
+										"crJtzsol4olb",
+										"B0lcI9xz1r8K"
+									],
+									"title": "Content language",
+									"notePosition": 10,
+									"prefix": null,
+									"isExpanded": false,
+									"type": "text",
+									"mime": "text/html",
+									"attributes": [
+										{
+											"type": "relation",
+											"name": "internalLink",
+											"value": "3I277VKYxWDH",
+											"isInheritable": false,
+											"position": 10
+										}
+									],
+									"format": "html",
+									"dataFileName": "Content language.html",
+									"attachments": [
+										{
+											"attachmentId": "OpIv6CnYCLVa",
+											"title": "image.png",
+											"role": "image",
+											"mime": "image/png",
+											"position": 10,
+											"dataFileName": "Content language_image.png"
+										}
+									]
+								}
+							]
 						},
 						{
 							"isClone": false,
@@ -382,7 +511,7 @@
 							"title": "Book",
 							"notePosition": 70,
 							"prefix": null,
-							"isExpanded": true,
+							"isExpanded": false,
 							"type": "text",
 							"mime": "text/html",
 							"attributes": [
@@ -576,6 +705,14 @@
 											"mime": "image/png",
 											"position": 10,
 											"dataFileName": "18_Calendar View_image.png"
+										},
+										{
+											"attachmentId": "JM6AU8N4MIgB",
+											"title": "image.png",
+											"role": "image",
+											"mime": "image/png",
+											"position": 10,
+											"dataFileName": "19_Calendar View_image.png"
 										}
 									]
 								}
@@ -697,7 +834,7 @@
 								"wmegHv51MJMd",
 								"foPEtsL51pD2"
 							],
-							"title": "Geo Map",
+							"title": "Geo map",
 							"notePosition": 120,
 							"prefix": null,
 							"isExpanded": false,
@@ -713,23 +850,15 @@
 								}
 							],
 							"format": "html",
-							"dataFileName": "Geo Map.html",
+							"dataFileName": "Geo map.html",
 							"attachments": [
-								{
-									"attachmentId": "J0baLTpafs7C",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "Geo Map_image.png"
-								},
 								{
 									"attachmentId": "kcYjOvJDFkbS",
 									"title": "image.png",
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "1_Geo Map_image.png"
+									"dataFileName": "Geo map_image.png"
 								},
 								{
 									"attachmentId": "FDP3JzIVSnuJ",
@@ -737,7 +866,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "2_Geo Map_image.png"
+									"dataFileName": "1_Geo map_image.png"
 								},
 								{
 									"attachmentId": "eUrcqc8RRuZG",
@@ -745,7 +874,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "3_Geo Map_image.png"
+									"dataFileName": "2_Geo map_image.png"
 								},
 								{
 									"attachmentId": "1quk4yxJpeHZ",
@@ -753,7 +882,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "4_Geo Map_image.png"
+									"dataFileName": "3_Geo map_image.png"
 								},
 								{
 									"attachmentId": "iSpyhQ5Ya6Nk",
@@ -761,7 +890,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "5_Geo Map_image.png"
+									"dataFileName": "4_Geo map_image.png"
 								},
 								{
 									"attachmentId": "ut6vm2aXVfXI",
@@ -769,7 +898,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "6_Geo Map_image.png"
+									"dataFileName": "5_Geo map_image.png"
 								},
 								{
 									"attachmentId": "uYdb9wWf5Nuv",
@@ -777,15 +906,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "7_Geo Map_image.png"
-								},
-								{
-									"attachmentId": "GhHYO2LteDmZ",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "8_Geo Map_image.png"
+									"dataFileName": "6_Geo map_image.png"
 								},
 								{
 									"attachmentId": "viN50n5G4kB0",
@@ -793,7 +914,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "9_Geo Map_image.png"
+									"dataFileName": "7_Geo map_image.png"
 								},
 								{
 									"attachmentId": "mgwGrtQZjxxb",
@@ -801,7 +922,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "10_Geo Map_image.png"
+									"dataFileName": "8_Geo map_image.png"
 								},
 								{
 									"attachmentId": "PMqmCbNLlZOG",
@@ -809,7 +930,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "11_Geo Map_image.png"
+									"dataFileName": "9_Geo map_image.png"
 								},
 								{
 									"attachmentId": "0AwaQMqt3FVA",
@@ -817,7 +938,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "12_Geo Map_image.png"
+									"dataFileName": "10_Geo map_image.png"
 								},
 								{
 									"attachmentId": "gR2c2Thmfy3I",
@@ -825,7 +946,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "13_Geo Map_image.png"
+									"dataFileName": "11_Geo map_image.png"
 								},
 								{
 									"attachmentId": "JULizn130rVI",
@@ -833,7 +954,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "14_Geo Map_image.png"
+									"dataFileName": "12_Geo map_image.png"
 								},
 								{
 									"attachmentId": "MdC0DpifJwu4",
@@ -841,7 +962,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "15_Geo Map_image.png"
+									"dataFileName": "13_Geo map_image.png"
 								},
 								{
 									"attachmentId": "gFR2Izzp18LQ",
@@ -849,7 +970,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "16_Geo Map_image.png"
+									"dataFileName": "14_Geo map_image.png"
 								},
 								{
 									"attachmentId": "42AncDs7SSAf",
@@ -857,15 +978,7 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "17_Geo Map_image.png"
-								},
-								{
-									"attachmentId": "pKdtiq4r0eFY",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "18_Geo Map_image.png"
+									"dataFileName": "15_Geo map_image.png"
 								},
 								{
 									"attachmentId": "FXRVvYpOxWyR",
@@ -873,7 +986,23 @@
 									"role": "image",
 									"mime": "image/png",
 									"position": 10,
-									"dataFileName": "19_Geo Map_image.png"
+									"dataFileName": "16_Geo map_image.png"
+								},
+								{
+									"attachmentId": "qudP7UCtwIq3",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/jpg",
+									"position": 10,
+									"dataFileName": "17_Geo map_image.png"
+								},
+								{
+									"attachmentId": "utecGxWk08QY",
+									"title": "image.png",
+									"role": "image",
+									"mime": "image/png",
+									"position": 10,
+									"dataFileName": "18_Geo map_image.png"
 								}
 							]
 						}
@@ -943,173 +1072,6 @@
 						}
 					]
 				},
-				{
-					"isClone": false,
-					"noteId": "DtJJ20yEozPA",
-					"notePath": [
-						"OkOZllzB3fqN",
-						"DtJJ20yEozPA"
-					],
-					"title": "Theme development",
-					"notePosition": 130,
-					"prefix": null,
-					"isExpanded": false,
-					"type": "text",
-					"mime": "text/html",
-					"attributes": [
-						{
-							"type": "label",
-							"name": "iconClass",
-							"value": "bx bx-palette",
-							"isInheritable": false,
-							"position": 10
-						}
-					],
-					"format": "html",
-					"attachments": [],
-					"dirFileName": "Theme development",
-					"children": [
-						{
-							"isClone": false,
-							"noteId": "5HH79ztN0fZA",
-							"notePath": [
-								"OkOZllzB3fqN",
-								"DtJJ20yEozPA",
-								"5HH79ztN0fZA"
-							],
-							"title": "Creating a custom theme",
-							"notePosition": 10,
-							"prefix": null,
-							"isExpanded": false,
-							"type": "text",
-							"mime": "text/html",
-							"attributes": [
-								{
-									"type": "relation",
-									"name": "internalLink",
-									"value": "aH8Dk5aMiq7R",
-									"isInheritable": false,
-									"position": 10
-								}
-							],
-							"format": "html",
-							"dataFileName": "Creating a custom theme.html",
-							"attachments": [
-								{
-									"attachmentId": "AJHVfQtIQgJ7",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "Creating a custom theme_im.png"
-								},
-								{
-									"attachmentId": "gXLyv5KXjfxg",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "1_Creating a custom theme_im.png"
-								},
-								{
-									"attachmentId": "on1gD7BzCWdN",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "2_Creating a custom theme_im.png"
-								},
-								{
-									"attachmentId": "17p6z24yW5eP",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "3_Creating a custom theme_im.png"
-								},
-								{
-									"attachmentId": "K3cdwj8f90m0",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "4_Creating a custom theme_im.png"
-								},
-								{
-									"attachmentId": "bn93hwF7C8sR",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "5_Creating a custom theme_im.png"
-								}
-							]
-						},
-						{
-							"isClone": false,
-							"noteId": "aH8Dk5aMiq7R",
-							"notePath": [
-								"OkOZllzB3fqN",
-								"DtJJ20yEozPA",
-								"aH8Dk5aMiq7R"
-							],
-							"title": "Customize the Next theme",
-							"notePosition": 20,
-							"prefix": null,
-							"isExpanded": false,
-							"type": "text",
-							"mime": "text/html",
-							"attributes": [],
-							"format": "html",
-							"dataFileName": "Customize the Next theme.html",
-							"attachments": [
-								{
-									"attachmentId": "5z4bC0x0eH0P",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "Customize the Next theme_i.png"
-								},
-								{
-									"attachmentId": "u0zkXkD7rGXA",
-									"title": "image.png",
-									"role": "image",
-									"mime": "image/png",
-									"position": 10,
-									"dataFileName": "1_Customize the Next theme_i.png"
-								}
-							]
-						},
-						{
-							"isClone": false,
-							"noteId": "pMq6N1oBV9oo",
-							"notePath": [
-								"OkOZllzB3fqN",
-								"DtJJ20yEozPA",
-								"pMq6N1oBV9oo"
-							],
-							"title": "Reference",
-							"notePosition": 30,
-							"prefix": null,
-							"isExpanded": false,
-							"type": "text",
-							"mime": "text/html",
-							"attributes": [
-								{
-									"type": "relation",
-									"name": "internalLink",
-									"value": "po38jIc0LD2H",
-									"isInheritable": false,
-									"position": 10
-								}
-							],
-							"format": "html",
-							"dataFileName": "Reference.html",
-							"attachments": []
-						}
-					]
-				},
 				{
 					"isClone": false,
 					"noteId": "LTnkDnYmmZ7s",
@@ -1283,7 +1245,7 @@
 									"title": "ETAPI",
 									"notePosition": 10,
 									"prefix": null,
-									"isExpanded": true,
+									"isExpanded": false,
 									"type": "text",
 									"mime": "text/html",
 									"attributes": [],
@@ -1333,7 +1295,7 @@
 									"title": "Internal API",
 									"notePosition": 20,
 									"prefix": null,
-									"isExpanded": true,
+									"isExpanded": false,
 									"type": "text",
 									"mime": "text/html",
 									"attributes": [],

src/public/app/doc_notes/en/User Guide/User Guide/New Features/Export as PDF.html

@@ -23,7 +23,7 @@
           as PDF. On the server or PWA (mobile), the option is not available due
           to technical constraints and it will be hidden.</p>
         <p>To print a note, select the
-          <img src="2_Export as PDF_image.png" width="29"
+          <img src="1_Export as PDF_image.png" width="29"
           height="31">button to the right of the note and select <i>Export as PDF</i>.</p>
         <p>Afterwards you will be prompted to select where to save the PDF file.
           Upon confirmation, the resulting PDF will be opened automatically using
@@ -33,7 +33,7 @@
           <a
           href="#root/OeKBfN6JbMIq/jRV1MPt4mNSP/hrC6xn7hnDq5">report the issue</a>. In this case, it's best to offer a sample note (click
             on the
-            <img src="2_Export as PDF_image.png" width="29" height="31">button, select Export note → This note and all of its descendants → HTML
+            <img src="1_Export as PDF_image.png" width="29" height="31">button, select Export note → This note and all of its descendants → HTML
             in ZIP archive). Make sure not to accidentally leak any personal information.</p>
         <h2>Landscape mode</h2>
         <p>When exporting to PDF, there are no customizable settings such as page

src/public/app/doc_notes/en/User Guide/User Guide/New Features/Right-to-left text notes.html

@@ -0,0 +1,56 @@
+<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>Right-to-left text notes</title>
+  </head>
+  
+  <body>
+    <div class="content">
+       <h1 data-trilium-h1>Right-to-left text notes</h1>
+
+      <div class="ck-content">
+        <p>Trilium now has basic support for right-to-left text, at note level.</p>
+        <figure
+        class="table">
+          <table>
+            <tbody>
+              <tr>
+                <td>
+                  <figure class="image">
+                    <img style="aspect-ratio:906/557;" src="3_Right-to-left text notes_i.png"
+                    width="906" height="557">
+                  </figure>
+                </td>
+                <td>
+                  <figure class="image">
+                    <img style="aspect-ratio:906/557;" src="2_Right-to-left text notes_i.png"
+                    width="906" height="557">
+                  </figure>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </figure>
+          <p>Note that only the Text note type supports this.</p>
+          <p>The list of languages is configurable via the a new dedicated settings
+            page:</p>
+          <figure class="image">
+            <img style="aspect-ratio:1248/635;" src="4_Right-to-left text notes_i.png"
+            width="1248" height="635">
+          </figure>
+          <p>To select the corresponding language of the text, go to “Basic Properties”
+            and select your desired language.</p>
+          <p>
+            <img src="1_Right-to-left text notes_i.png" width="635" height="492">
+          </p>
+          <p>Feel free to report any issues regarding right to left support.</p>
+          <p>&nbsp;</p>
+      </div>
+    </div>
+  </body>
+
+</html>

src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Book/Calendar View.html

@@ -118,6 +118,12 @@
                 <td>When present (regardless of value), it will show the number of the week
                   on the calendar.</td>
               </tr>
+              <tr>
+                <td><code>~child:template</code>
+                </td>
+                <td>Defines the template for newly created notes in the calendar (via dragging
+                  or clicking).</td>
+              </tr>
             </tbody>
           </table>
         </figure>
@@ -175,6 +181,36 @@
                   than the title, either a label (e.g. <code>#assignee</code>) or a relation
                   (e.g. <code>~for</code>). See <i>Advanced use-cases</i> for more information.</td>
               </tr>
+              <tr>
+                <td><code>#calendar:promotedAttributes</code>
+                </td>
+                <td>
+                  <p>Allows displaying the value of one or more promoted attributes in the
+                    calendar like this:
+                    <img src="19_Calendar View_image.png" width="131" height="113">
+                  </p><pre><code class="language-text-x-trilium-auto">#label:weight="promoted,number,single,precision=1"
+#label:mood="promoted,alias=Mood,single,text"
+#calendar:promotedAttributes="label:weight,label:mood" </code></pre>
+                  <p>It can also be used with relations, case in which it will display the
+                    title of the target note:</p><pre><code class="language-text-x-trilium-auto">#relation:assignee="promoted,alias=Assignee,single,text"
+#calendar:promotedAttributes="relation:assignee" 
+~assignee=@My assignee </code></pre>
+                </td>
+              </tr>
+              <tr>
+                <td><code>#calendar:startDate</code>
+                </td>
+                <td>Allows using a different label to represent the start date, other than <code>#startDate</code> (e.g. <code>#expiryDate</code>).
+                  The label name must be prefixed with <code>#</code>. If the label is not
+                  defined for a note, the default will be used instead.</td>
+              </tr>
+              <tr>
+                <td><code>#calendar:endDate</code>
+                </td>
+                <td>Allows using a different label to represent the start date, other than <code>#endDate</code>.
+                  The label name must be prefixed with <code>#</code>. If the label is not
+                  defined for a note, the default will be used instead.</td>
+              </tr>
             </tbody>
           </table>
           </figure>

src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map.html

@@ -5,12 +5,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="../../style.css">
     <base target="_parent">
-    <title data-trilium-title>Geo Map</title>
+    <title data-trilium-title>Geo map</title>
   </head>
   
   <body>
     <div class="content">
-       <h1 data-trilium-h1>Geo Map</h1>
+       <h1 data-trilium-h1>Geo map</h1>
 
       <div class="ck-content">
         <h2>Creating a new geo map</h2>
@@ -26,7 +26,7 @@
                 <th>1</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:1256/1044;" src="9_Geo Map_image.png" width="1256"
+                    <img style="aspect-ratio:1256/1044;" src="7_Geo map_image.png" width="1256"
                     height="1044">
                   </figure>
                 </td>
@@ -36,7 +36,7 @@
                 <th>2</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:1720/1396;" src="3_Geo Map_image.png" width="1720"
+                    <img style="aspect-ratio:1720/1396;" src="2_Geo map_image.png" width="1720"
                     height="1396">
                   </figure>
                 </td>
@@ -69,18 +69,18 @@
                   <p>To create a marker, first navigate to the desired point on the map. Then
                     press the
                     <img class="image_resized" style="aspect-ratio:72/66;width:7.37%;"
-                    src="4_Geo Map_image.png" width="72" height="66">button on the top-right of the map.</p>
+                    src="3_Geo map_image.png" width="72" height="66">button on the top-right of the map.</p>
                   <p>If the button is not visible, make sure the button section is visible
                     by pressing the chevron button (
                     <img class="image_resized" style="aspect-ratio:72/66;width:7.51%;"
-                    src="10_Geo Map_image.png" width="72" height="66">) in the top-right of the map.</p>
+                    src="8_Geo map_image.png" width="72" height="66">) in the top-right of the map.</p>
                 </td>
               </tr>
               <tr>
                 <th>2</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:1730/416;" src="14_Geo Map_image.png" width="1730"
+                    <img style="aspect-ratio:1730/416;" src="12_Geo map_image.png" width="1730"
                     height="416">
                   </figure>
                   <p>&nbsp;</p>
@@ -96,7 +96,7 @@
                 <th>3</th>
                 <td>
                   <figure class="image">
-                    <img style="aspect-ratio:1586/404;" src="1_Geo Map_image.png" width="1586"
+                    <img style="aspect-ratio:1586/404;" src="Geo map_image.png" width="1586"
                     height="404">
                   </figure>
                   <p>&nbsp;</p>
@@ -107,7 +107,7 @@
                 <th>4</th>
                 <td>
                   <figure class="image">
-                    <img style="aspect-ratio:1696/608;" src="6_Geo Map_image.png" width="1696"
+                    <img style="aspect-ratio:1696/608;" src="5_Geo map_image.png" width="1696"
                     height="608">
                   </figure>
                   <p>&nbsp;</p>
@@ -122,7 +122,7 @@
         <p>The location of a marker is stored in the <code>#geolocation</code> attribute
           of the child notes:</p>
         <figure class="image">
-          <img style="aspect-ratio:1288/278;" src="12_Geo Map_image.png" width="1288"
+          <img style="aspect-ratio:1288/278;" src="10_Geo map_image.png" width="1288"
           height="278">
         </figure>
         <p>This value can be added manually if needed. The value of the attribute
@@ -155,6 +155,13 @@
             </ul>
           </li>
         </ul>
+        <h2>Icon and color of the markers</h2>
+        <p>
+          <img src="18_Geo map_image.png" alt="image" width="523" height="295">
+        </p>
+        <p>The markers will have the same icon as the note.</p>
+        <p>It's possible to add a custom color to a marker by assigning them a <code>#color</code> attribute
+          such as <code>#color=green</code>.</p>
         <h2>Adding the coordinates manually</h2>
         <p>In a nutshell, create a child note and set the <code>#geolocation</code> attribute
           to the coordinates.</p>
@@ -168,7 +175,7 @@
                 <th>1</th>
                 <td>
                   <figure class="image image-style-align-center image_resized" style="width:100%;">
-                    <img style="aspect-ratio:732/918;" src="16_Geo Map_image.png" width="732"
+                    <img style="aspect-ratio:732/918;" src="14_Geo map_image.png" width="732"
                     height="918">
                   </figure>
                 </td>
@@ -185,7 +192,7 @@
                 <th>2</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:518/84;" src="19_Geo Map_image.png" width="518"
+                    <img style="aspect-ratio:518/84;" src="16_Geo map_image.png" width="518"
                     height="84">
                   </figure>
                 </td>
@@ -199,7 +206,7 @@
                 <th>3</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:1074/276;" src="11_Geo Map_image.png" width="1074"
+                    <img style="aspect-ratio:1074/276;" src="9_Geo map_image.png" width="1074"
                     height="276">
                   </figure>
                 </td>
@@ -225,7 +232,7 @@
                 <th>1</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:562/454;" src="17_Geo Map_image.png" width="562"
+                    <img style="aspect-ratio:562/454;" src="15_Geo map_image.png" width="562"
                     height="454">
                   </figure>
                 </td>
@@ -236,7 +243,7 @@
                 <th>2</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:696/480;" src="13_Geo Map_image.png" width="696"
+                    <img style="aspect-ratio:696/480;" src="11_Geo map_image.png" width="696"
                     height="480">
                   </figure>
                 </td>
@@ -250,7 +257,7 @@
                 <th>3</th>
                 <td>
                   <figure class="image">
-                    <img style="aspect-ratio:640/276;" src="2_Geo Map_image.png" width="640"
+                    <img style="aspect-ratio:640/276;" src="1_Geo map_image.png" width="640"
                     height="276">
                   </figure>
                 </td>
@@ -275,7 +282,7 @@
                 <th>1</th>
                 <td>
                   <figure class="image">
-                    <img style="aspect-ratio:226/74;" src="7_Geo Map_image.png" width="226"
+                    <img style="aspect-ratio:226/74;" src="6_Geo map_image.png" width="226"
                     height="74">
                   </figure>
                 </td>
@@ -286,7 +293,7 @@
                 <th>2</th>
                 <td>
                   <figure class="image">
-                    <img style="aspect-ratio:322/222;" src="5_Geo Map_image.png" width="322"
+                    <img style="aspect-ratio:322/222;" src="4_Geo map_image.png" width="322"
                     height="222">
                   </figure>
                 </td>
@@ -297,7 +304,7 @@
                 <th>3</th>
                 <td>
                   <figure class="image image_resized" style="width:100%;">
-                    <img style="aspect-ratio:620/530;" src="15_Geo Map_image.png" width="620"
+                    <img style="aspect-ratio:620/530;" src="13_Geo map_image.png" width="620"
                     height="530">
                   </figure>
                 </td>
@@ -310,9 +317,16 @@
             </tbody>
           </table>
           </figure>
-          <p>&nbsp;</p>
-          <p>&nbsp;</p>
-          <p>&nbsp;</p>
+          <h2>Troubleshooting</h2>
+          <h3>Grid-like artifacts on the map</h3>
+          <p>
+            <img class="image_resized" style="aspect-ratio:678/499;width:58%;" src="17_Geo map_image.png"
+            width="678" height="499">
+          </p>
+          <p>This occurs if the application is not at 100% zoom which causes the pixels
+            of the map to not render correctly due to fractional scaling. The only
+            possible solution i to set the UI zoom at 100% (default keyboard shortcut
+            is Ctrl+0).</p>
           <p>&nbsp;</p>
       </div>
     </div>

src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text.html

@@ -1,19 +0,0 @@
-<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>Text</title>
-  </head>
-  
-  <body>
-    <div class="content">
-       <h1 data-trilium-h1>Text</h1>
-
-      <div class="ck-content"></div>
-    </div>
-  </body>
-
-</html>

src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language.html

@@ -0,0 +1,34 @@
+<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>Content language</title>
+  </head>
+  
+  <body>
+    <div class="content">
+       <h1 data-trilium-h1>Content language</h1>
+
+      <div class="ck-content">
+        <p>A language hint can be provided for text notes. This option informs the
+          browser or the desktop application about the language the note is written
+          in (for example this might help with spellchecking), and it also determines
+          whether the text is displayed from right-to-left for languages such as
+          Arabic, Hebrew, etc.</p>
+        <p>For more information about right-to-left support, see&nbsp;<a class="reference-link"
+          href="../../New%20Features/Right-to-left%20text%20notes.html">Right-to-left text notes</a>.</p>
+        <p>To set the language of the content, go to “Basic Properties” and look
+          for the “Language” field. By default there will be no content languages
+          set, they can be configured by going to settings or by selecting the “Configure
+          languages” item in the list.</p>
+        <p>
+          <img src="Content language_image.png" width="635" height="492">
+        </p>
+      </div>
+    </div>
+  </body>
+
+</html>

src/public/app/doc_notes/en/User Guide/User Guide/Theme development/Creating a custom theme.html

@@ -1,94 +0,0 @@
-<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>Creating a custom theme</title>
-  </head>
-  
-  <body>
-    <div class="content">
-       <h1 data-trilium-h1>Creating a custom theme</h1>
-
-      <div class="ck-content">
-        <h2>Step 1. Find a place to place the themes</h2>
-        <p>Organization is an important aspect of managing a knowledge base. When
-          developing a new theme or importing an existing one it's a good idea to
-          keep them into one place.</p>
-        <p>As such, the first step is to create a new note to gather all the themes.</p>
-        <p>
-          <img src="5_Creating a custom theme_im.png" width="181" height="84">
-        </p>
-        <h2>Step 2. Create the theme</h2>
-        <figure class="table" style="width:100%;">
-          <table class="ck-table-resized">
-            <colgroup>
-              <col style="width:32.47%;">
-                <col style="width:67.53%;">
-            </colgroup>
-            <tbody>
-              <tr>
-                <td>
-                  <figure class="image">
-                    <img style="aspect-ratio:651/220;" src="3_Creating a custom theme_im.png"
-                    width="651" height="220">
-                  </figure>
-                </td>
-                <td style="vertical-align:top;">Themes are code notes with a special attribute. Start by creating a new
-                  code note.</td>
-              </tr>
-              <tr>
-                <td>
-                  <figure class="image">
-                    <img style="aspect-ratio:302/349;" src="1_Creating a custom theme_im.png"
-                    width="302" height="349">
-                  </figure>
-                </td>
-                <td style="vertical-align:top;">Then change the note type to a CSS code.</td>
-              </tr>
-              <tr>
-                <td>
-                  <figure class="image">
-                    <img style="aspect-ratio:316/133;" src="Creating a custom theme_im.png"
-                    width="316" height="133">
-                  </figure>
-                </td>
-                <td style="vertical-align:top;">In the <i>Owned Attributes</i> section define the <code>#appTheme</code> attribute
-                  to point to any desired name. This is the name that will show up in the
-                  appearance section in settings.</td>
-              </tr>
-            </tbody>
-          </table>
-        </figure>
-        <h2>Step 3. Define the theme's CSS</h2>
-        <p>As a very simple example we will change the background color of the launcher
-          pane to a shade of blue.</p>
-        <p>To alter the different variables of the theme:</p><pre><code class="language-text-css">:root {
-	--launcher-pane-background-color: #0d6efd;
-}</code></pre>
-        <h2>Step 4. Activating the theme</h2>
-        <p>Refresh the application (Ctrl+Shift+R is a good way to do so) and go to
-          settings. You should see the newly created theme:</p>
-        <p>
-          <img src="2_Creating a custom theme_im.png" width="631" height="481">
-        </p>
-        <p>Afterwards the application will refresh itself with the new theme:</p>
-        <p>
-          <img src="4_Creating a custom theme_im.png" width="653" height="554">
-        </p>
-        <p>Do note that the theme will be based off of the legacy theme. To override
-          that and base the theme on the new TriliumNext theme, see:&nbsp;<a class="reference-link"
-          href="Customize%20the%20Next%20theme.html">Theme base (legacy vs. next)</a>
-        </p>
-        <h2>Step 5. Making changes</h2>
-        <p>Simply go back to the note and change according to needs. To apply the
-          changes to the current window, press Ctrl+Shift+R to refresh.</p>
-        <p>It's a good idea to keep two windows, one for editing and the other one
-          for previewing the changes.</p>
-      </div>
-    </div>
-  </body>
-
-</html>

src/public/app/doc_notes/en/User Guide/User Guide/Theme development/Customize the Next theme.html

@@ -1,36 +0,0 @@
-<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>Customize the Next theme</title>
-  </head>
-  
-  <body>
-    <div class="content">
-       <h1 data-trilium-h1>Customize the Next theme</h1>
-
-      <div class="ck-content">
-        <p>By default, any custom theme will be based on the legacy light theme.
-          To use the TriliumNext theme instead, add the <code>#appThemeBase=next</code> attribute
-          onto the existing theme. The <code>appTheme</code> attribute must also be
-          present.</p>
-        <p>
-          <img src="Customize the Next theme_i.png" width="424" height="140">
-        </p>
-        <p>When <code>appThemeBase</code> is set to <code>next</code> it will use the
-          “TriliumNext (auto)” theme. Any other value is ignored and will use the
-          legacy white theme instead.</p>
-        <h2>Overrides</h2>
-        <p>Do note that the TriliumNext theme has a few more overrides than the legacy
-          theme, so you might need to suffix <code>!important</code> if the style changes
-          are not applied.</p><pre><code class="language-text-css">:root {
-	--launcher-pane-background-color: #0d6efd !important;
-}</code></pre>
-      </div>
-    </div>
-  </body>
-
-</html>

src/public/app/doc_notes/en/User Guide/User Guide/Theme development/Reference.html

@@ -1,180 +0,0 @@
-<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>Reference</title>
-  </head>
-  
-  <body>
-    <div class="content">
-       <h1 data-trilium-h1>Reference</h1>
-
-      <div class="ck-content">
-        <h2>Detecting mobile vs. desktop</h2>
-        <p>The mobile layout is different than the one on the desktop. Use <code>body.mobile</code> and <code>body.desktop</code> to
-          differentiate between them.</p><pre><code class="language-text-css">body.mobile #root-widget {
-	/* Do something on mobile */
-}
-
-body.desktop #root-widget {
-	/* Do something on desktop */
-}</code></pre>
-        <p>Do note that there is also a “tablet mode” in the mobile layout. For that
-          particular case media queries are required:</p><pre><code class="language-text-css">@media (max-width: 991px) {
-
-    #launcher-pane {
-
-        /* Do something on mobile layout */
-
-    }
-
-}
-
-
-
-@media (min-width: 992px) {
-
-    #launcher-pane {
-
-        /* Do something on mobile tablet + desktop layout */
-
-    }
-
-}</code></pre>
-        <h2>Detecting horizontal vs. vertical layout</h2>
-        <p>The user can select between vertical layout (the classical one, where
-          the launcher bar is on the left) and a horizontal layout (where the launcher
-          bar is on the top and tabs are full-width).</p>
-        <p>Different styles can be applied by using classes at <code>body</code> level:</p><pre><code class="language-text-x-trilium-auto">body.layout-vertical #left-pane {
-	/* Do something */
-}
-
-body.layout-horizontal #center-pane {
-	/* Do something else */	
-}</code></pre>
-        <p>The two different layouts use different containers (but they are present
-          in the DOM regardless of the user's choice), for example <code>#horizontal-main-container</code> and <code>#vertical-main-container</code> can
-          be used to customize the background of the content section.</p>
-        <h2>Detecting platform (Windows, macOS) or Electron</h2>
-        <p>It is possible to add particular styles that only apply to a given platform
-          by using the classes in <code>body</code>:</p>
-        <figure class="table">
-          <table>
-            <thead>
-              <tr>
-                <th>Windows</th>
-                <th>macOS</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td><pre><code class="language-text-x-trilium-auto">body.platform-win32 {
-	background: red;
-}</code></pre>
-                </td>
-                <td><pre><code class="language-text-x-trilium-auto">body.platform-darwin {
-	background: red;
-}</code></pre>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </figure>
-        <p>It is also possible to only apply a style if running under Electron (desktop
-          application):</p><pre><code class="language-text-x-trilium-auto">body.electron {
-	background: blue;
-}</code></pre>
-        <h3>Native title bar</h3>
-        <p>It's possible to detect if the user has selected the native title bar
-          or the custom title bar by querying against <code>body</code>:</p><pre><code class="language-text-x-trilium-auto">body.electron.native-titlebar {
-	/* Do something */
-}
-
-body.electron:not(.native-titlebar) {
-	/* Do something else */
-}</code></pre>
-        <h3>Native window buttons</h3>
-        <p>When running under Electron with native title bar off, a feature was introduced
-          to use the platform-specific window buttons such as the semaphore on macOS.</p>
-        <p>See <a href="https://github.com/TriliumNext/Notes/pull/702">Native title bar buttons by eliandoran · Pull Request #702 · TriliumNext/Notes</a> for
-          the original implementation of this feature, including screenshots.</p>
-        <h4>On Windows</h4>
-        <p>The colors of the native window button area can be adjusted using a RGB
-          hex color:</p><pre><code class="language-text-x-trilium-auto">body {
-	--native-titlebar-foreground: #ffffff;
-	--native-titlebar-background: #ff0000;
-}</code></pre>
-        <p>It is also possible to use transparency at the cost of reduced hover colors
-          using a RGBA hex color:</p><pre><code class="language-text-x-trilium-auto">body {
-	--native-titlebar-background: #ff0000aa;
-}</code></pre>
-        <p>Note that the value is read when the window is initialized and then it
-          is refreshed only when the user changes their light/dark mode preference.</p>
-        <h4>On macOS</h4>
-        <p>On macOS the semaphore window buttons are enabled by default when the
-          native title bar is disabled. The offset of the buttons can be adjusted
-          using:</p><pre><code class="language-text-css">body {
-    --native-titlebar-darwin-x-offset: 12;
-    --native-titlebar-darwin-y-offset: 14 !important;
-}</code></pre>
-        <h3>Background/transparency effects on Windows (Mica)</h3>
-        <p>Windows 11 offers a special background/transparency effect called Mica,
-          which can be enabled by themes by setting the <code>--background-material</code> variable
-          at <code>body</code> level:</p><pre><code class="language-text-css">body.electron.platform-win32 {
-	--background-material: tabbed; 
-}</code></pre>
-        <p>The value can be either <code>tabbed</code> (especially useful for the horizontal
-          layout) or <code>mica</code> (ideal for the vertical layout).</p>
-        <p>Do note that the Mica effect is applied at <code>body</code> level and the
-          theme needs to make the entire hierarchy (semi-)transparent in order for
-          it to be visible. Use the TrilumNext theme as an inspiration.</p>
-        <h2>Note icons, tab workspace accent color</h2>
-        <p>Theme capabilities are small adjustments done through CSS variables that
-          can affect the layout or the visual aspect of the application.</p>
-        <p>In the tab bar, to display the icons of notes instead of the icon of the
-          workspace:</p><pre><code class="language-text-css">:root {
-	--tab-note-icons: true;
-}</code></pre>
-        <p>When a workspace is hoisted for a given tab, it is possible to get the
-          background color of that workspace, for example to apply a small strip
-          on the tab instead of the whole background color:</p><pre><code class="language-text-css">.note-tab .note-tab-wrapper {
-    --tab-background-color: initial !important;
-}
-
-.note-tab .note-tab-wrapper::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 3px;
-    background-color: var(--workspace-tab-background-color);
-}</code></pre>
-        <h2>Custom fonts</h2>
-        <p>Currently the only way to include a custom font is to use&nbsp;<a class="reference-link"
-          href="../Advanced%20topics/Custom%20resource%20providers.html">Custom resource providers</a>.
-          Basically import a font into Trilium and assign it <code>#customResourceProvider=fonts/myfont.ttf</code> and
-          then import the font in CSS via <code>/custom/fonts/myfont.ttf</code>.</p>
-        <h2>Dark and light themes</h2>
-        <p>A light theme needs to have the following CSS:</p><pre><code class="language-text-css">:root {
-	--theme-style: light;
-}</code></pre>
-        <p>if the theme is dark, then <code>--theme-style</code> needs to be <code>dark</code>.</p>
-        <p>If the theme is auto (e.g. supports both light or dark based on <code>prefers-color-scheme</code>)
-          it must also declare (in addition to setting <code>--theme-style</code> to
-          either <code>light</code> or <code>dark</code>):</p><pre><code class="language-text-css">:root {
-
-    --theme-style-auto: true;
-
-}</code></pre>
-        <p>This will affect the behavior of the Electron application by informing
-          the operating system of the color preference (e.g. background effects will
-          appear correct on Windows).</p>
-      </div>
-    </div>
-  </body>
-
-</html>

src/public/app/doc_notes/en/User Guide/index.html

@@ -6,6 +6,6 @@
 </head>
 <frameset cols="25%,75%">
     <frame name="navigation" src="navigation.html">
-    <frame name="detail" src="User%20Guide/Features/Export%20as%20PDF.html">
+    <frame name="detail" src="User%20Guide/New%20Features/Right-to-left%20text%20notes.html">
 </frameset>
 </html>

src/public/app/doc_notes/en/User Guide/navigation.html

@@ -9,17 +9,24 @@
     <ul>
       <li>User Guide
         <ul>
-          <li>Features
+          <li>New Features
             <ul>
-              <li><a href="User%20Guide/Features/Export%20as%20PDF.html" target="detail">Export as PDF</a>
+              <li><a href="User%20Guide/New%20Features/Right-to-left%20text%20notes.html"
+                target="detail">Right-to-left text notes</a>
               </li>
-              <li><a href="User%20Guide/Features/Zen%20mode.html" target="detail">Zen mode</a>
+              <li><a href="User%20Guide/New%20Features/Zen%20mode.html" target="detail">Zen mode</a>
+              </li>
+              <li><a href="User%20Guide/New%20Features/Export%20as%20PDF.html" target="detail">Export as PDF</a>
               </li>
             </ul>
           </li>
           <li>Note Types
             <ul>
-              <li><a href="User%20Guide/Note%20Types/Text.html" target="detail">Text</a>
+              <li>Text
+                <ul>
+                  <li><a href="User%20Guide/Note%20Types/Text/Content%20language.html" target="detail">Content language</a>
+                  </li>
+                </ul>
               </li>
               <li><a href="User%20Guide/Note%20Types/Code.html" target="detail">Code</a>
               </li>
@@ -45,7 +52,7 @@
               </li>
               <li><a href="User%20Guide/Note%20Types/Mind%20Map.html" target="detail">Mind Map</a>
               </li>
-              <li><a href="User%20Guide/Note%20Types/Geo%20Map.html" target="detail">Geo Map</a>
+              <li><a href="User%20Guide/Note%20Types/Geo%20map.html" target="detail">Geo map</a>
               </li>
             </ul>
           </li>
@@ -56,18 +63,6 @@
               </li>
             </ul>
           </li>
-          <li>Theme development
-            <ul>
-              <li><a href="User%20Guide/Theme%20development/Creating%20a%20custom%20theme.html"
-                target="detail">Creating a custom theme</a>
-              </li>
-              <li><a href="User%20Guide/Theme%20development/Customize%20the%20Next%20theme.html"
-                target="detail">Customize the Next theme</a>
-              </li>
-              <li><a href="User%20Guide/Theme%20development/Reference.html" target="detail">Reference</a>
-              </li>
-            </ul>
-          </li>
           <li>Scripting
             <ul>
               <li>Examples

src/public/app/entities/fattachment.ts

@@ -19,18 +19,18 @@ export interface FAttachmentRow {
 class FAttachment {
     private froca: Froca;
     attachmentId!: string;
-    private ownerId!: string;
+    ownerId!: string;
     role!: string;
     mime!: string;
     title!: string;
     isProtected!: boolean; // TODO: Is this used?
     private dateModified!: string;
     utcDateModified!: string;
-    private utcDateScheduledForErasureSince!: string;
+    utcDateScheduledForErasureSince!: string;
     /**
      * optionally added to the entity
      */
-    private contentLength!: number;
+    contentLength!: number;
 
     constructor(froca: Froca, row: FAttachmentRow) {
         /** @type {Froca} */

src/public/app/entities/fbranch.ts

@@ -8,6 +8,7 @@ export interface FBranchRow {
     prefix?: string;
     isExpanded?: boolean;
     fromSearchNote: boolean;
+    isDeleted?: boolean;
 }
 
 /**