diff --git a/apps/client/package.json b/apps/client/package.json index f3341ba5c..cd1317e2b 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -55,7 +55,7 @@ "mark.js": "8.11.1", "marked": "16.4.2", "mermaid": "11.12.1", - "mind-elixir": "5.3.5", + "mind-elixir": "5.3.6", "normalize.css": "8.0.1", "panzoom": "9.4.3", "preact": "10.27.2", diff --git a/apps/client/src/widgets/collections/calendar/index.tsx b/apps/client/src/widgets/collections/calendar/index.tsx index 6cae60f26..bac6862b2 100644 --- a/apps/client/src/widgets/collections/calendar/index.tsx +++ b/apps/client/src/widgets/collections/calendar/index.tsx @@ -91,6 +91,7 @@ export default function CalendarView({ note, noteIds }: ViewModeProps setCalendarView(initialView.current)); useResizeObserver(containerRef, () => calendarRef.current?.updateSize()); @@ -134,6 +135,7 @@ export default function CalendarView({ note, noteIds }: ViewModePropsWhen present (regardless of value), it will show the number of the week on the calendar. + + #calendar:initialDate + + Change the date the calendar opens on. When not present, the calendar + opens on the current date. + #calendar:view diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html index a4c7191eb..06829a014 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html @@ -39,8 +39,8 @@ setup is suitable for testing or when using a proxy server like Nginx or Apache.

sudo docker run -t -i -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/trilium:[VERSION]
    -
  1. Verify the container is running using docker ps.
    2. -
  2. Access Trilium via a web browser at 127.0.0.1:8080.
    3. +
  3. Verify the container is running using docker ps.
    4. +
  4. Access Trilium via a web browser at 127.0.0.1:8080.

Local Network Access

To make the container accessible only on your local network, first create @@ -65,9 +65,9 @@ docker inspect [container_name] is the container's path. More details can be found in the Docker Volumes Documentation.

Reverse Proxy

    -
  1. Nginx +
  2. Nginx
    3. -
  3. Apache +
  4. Apache

Note on --user Directive

@@ -101,10 +101,12 @@ docker pull triliumnext/trilium:rootless-alpine

How It Works

The rootless Trilium image:

    -
  1. Creates a non-root user (trilium) during build time
    2. -
  2. Configures the application to run as this non-root user
    3. -
  3. Allows runtime customization of the user's UID/GID via Docker's --user flag
    4. -
  4. Does not require a separate Docker entrypoint script
    5. +
  5. Creates a non-root user (trilium) during build time
    6. +
  6. Configures the application to run as this non-root user
    7. +
  7. Allows runtime customization of the user's UID/GID via Docker's --user flag
    8. +
  8. Does not require a separate Docker entrypoint script

Usage

Using docker-compose (Recommended)

# Run with default UID/GID (1000:1000)
@@ -127,51 +129,51 @@ docker run -d --name trilium -p 8080:8080 --user $(id -u):$(id -g) -v ~/trilium-

Environment Variables

For a complete list of configuration environment variables (network settings, - authentication, sync, etc.), see Configuration (config.ini or environment variables).

+ authentication, sync, etc.), see Configuration (config.ini or environment variables).

Volume Permissions

If you encounter permission issues with the data volume, ensure that:

    -
  1. The host directory has appropriate permissions for the UID/GID you're +
  2. The host directory has appropriate permissions for the UID/GID you're using
    3. -
  3. You're setting both TRILIUM_UID and TRILIUM_GID to +
  4. You're setting both TRILIUM_UID and TRILIUM_GID to match the owner of the host directory
# For example, if your data directory is owned by UID 1001 and GID 1001:
 TRILIUM_UID=1001 TRILIUM_GID=1001 docker-compose -f docker-compose.rootless.yml up -d

Considerations

Available Rootless Images

Two rootless variants are provided:

    -
  1. Debian-based (default): Uses the Debian Bullseye Slim +
  2. Debian-based (default): Uses the Debian Bullseye Slim base image
      -
    • Dockerfile: apps/server/Dockerfile.rootless +
    • Dockerfile: apps/server/Dockerfile.rootless
      • -
    • Recommended for most users
      • +
    • Recommended for most users
    3. -
  3. Alpine-based: Uses the Alpine base image for smaller +
  4. Alpine-based: Uses the Alpine base image for smaller size
      -
    • Dockerfile: apps/server/Dockerfile.alpine.rootless +
    • Dockerfile: apps/server/Dockerfile.alpine.rootless
      • -
    • Smaller image size, but may have compatibility issues with some systems
      • +
    • Smaller image size, but may have compatibility issues with some systems
@@ -186,7 +188,9 @@ docker build --build-arg USER=myuser --build-arg UID=1001 --build-arg GID=1001 \

Available build arguments:

\ No newline at end of file diff --git a/docs/Developer Guide/!!!meta.json b/docs/Developer Guide/!!!meta.json index 9e479b0cc..4d2ee2157 100644 --- a/docs/Developer Guide/!!!meta.json +++ b/docs/Developer Guide/!!!meta.json @@ -1961,6 +1961,13 @@ "isInheritable": false, "position": 10 }, + { + "type": "relation", + "name": "internalLink", + "value": "lXjOyKpUSKgE", + "isInheritable": false, + "position": 20 + }, { "type": "label", "name": "iconClass", @@ -1974,13 +1981,6 @@ "value": "i18n", "isInheritable": false, "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "lXjOyKpUSKgE", - "isInheritable": false, - "position": 30 } ], "format": "markdown", diff --git a/docs/Developer Guide/Developer Guide/Documentation.md b/docs/Developer Guide/Developer Guide/Documentation.md index 617684bfd..df9104fa1 100644 --- a/docs/Developer Guide/Developer Guide/Documentation.md +++ b/docs/Developer Guide/Developer Guide/Documentation.md @@ -1,5 +1,5 @@ # Documentation -There are multiple types of documentation for Trilium: +There are multiple types of documentation for Trilium: * The _User Guide_ represents the user-facing documentation. This documentation can be browsed by users directly from within Trilium, by pressing F1. * The _Developer's Guide_ represents a set of Markdown documents that present the internals of Trilium, for developers. diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index 40a40e9fc..3fe30793c 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -694,6 +694,13 @@ "value": "bx bxl-docker", "isInheritable": false, "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "Gzjqa934BdH4", + "isInheritable": false, + "position": 50 } ], "format": "markdown", diff --git a/docs/User Guide/User Guide/Collections/Calendar.md b/docs/User Guide/User Guide/Collections/Calendar.md index 1499de851..82966739c 100644 --- a/docs/User Guide/User Guide/Collections/Calendar.md +++ b/docs/User Guide/User Guide/Collections/Calendar.md @@ -48,7 +48,7 @@ In the _Collections_ tab in the Configuration (config.ini or environment variables). +For a complete list of configuration environment variables (network settings, authentication, sync, etc.), see Configuration (config.ini or environment variables). ### Volume Permissions diff --git a/packages/commons/src/lib/attribute_names.ts b/packages/commons/src/lib/attribute_names.ts index 9db831a10..e186cf88a 100644 --- a/packages/commons/src/lib/attribute_names.ts +++ b/packages/commons/src/lib/attribute_names.ts @@ -33,6 +33,7 @@ type Labels = { "calendar:hideWeekends": boolean; "calendar:weekNumbers": boolean; "calendar:view": string; + "calendar:initialDate": string; "map:style": string; "map:scale": boolean; "board:groupBy": string; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89e346f04..ad305250f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -186,7 +186,7 @@ importers: version: 0.2.0(mermaid@11.12.1) '@mind-elixir/node-menu': specifier: 5.0.1 - version: 5.0.1(mind-elixir@5.3.5) + version: 5.0.1(mind-elixir@5.3.6) '@popperjs/core': specifier: 2.11.8 version: 2.11.8 @@ -275,8 +275,8 @@ importers: specifier: 11.12.1 version: 11.12.1 mind-elixir: - specifier: 5.3.5 - version: 5.3.5 + specifier: 5.3.6 + version: 5.3.6 normalize.css: specifier: 8.0.1 version: 8.0.1 @@ -10377,8 +10377,8 @@ packages: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} - mind-elixir@5.3.5: - resolution: {integrity: sha512-GKYTqU7qsbmPmdTvJlM0g/chrHIkikV7sYhQIz4GTa7Xp8H7hqL5y8gMeJLeR2gdJi3sLUyoVUzBwF7tmKIffw==} + mind-elixir@5.3.6: + resolution: {integrity: sha512-LU5HuRrtq/Fq/YkgZHUu4gb1Vg6tNQq0Ob7bQKNDTP3A8prcohHF5D7ca5blvqVkyf9+xUdBWsdFMNffMNPnkA==} mini-css-extract-plugin@2.4.7: resolution: {integrity: sha512-euWmddf0sk9Nv1O0gfeeUAvAkoSlWncNLF77C0TP2+WoPvy8mAHKOzMajcCz2dzvyt3CNgxb1obIEVFIRxaipg==} @@ -15616,6 +15616,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-block-quote@47.2.0': dependencies: @@ -15626,6 +15628,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-bookmark@47.2.0': dependencies: @@ -15636,6 +15640,8 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.2.0 '@ckeditor/ckeditor5-widget': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-case-change@47.2.0': dependencies: @@ -15946,6 +15952,8 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) es-toolkit: 1.39.5 + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-editor-multi-root@47.2.0': dependencies: @@ -15968,6 +15976,8 @@ snapshots: '@ckeditor/ckeditor5-table': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-emoji@47.2.0': dependencies: @@ -15980,6 +15990,8 @@ snapshots: ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) es-toolkit: 1.39.5 fuzzysort: 3.1.0 + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-engine@47.2.0': dependencies: @@ -16022,6 +16034,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-export-word@47.2.0': dependencies: @@ -16087,6 +16101,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-heading@47.2.0': dependencies: @@ -16097,6 +16113,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-highlight@47.2.0': dependencies: @@ -16142,6 +16160,8 @@ snapshots: '@ckeditor/ckeditor5-widget': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) es-toolkit: 1.39.5 + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-icons@47.2.0': {} @@ -16173,6 +16193,8 @@ snapshots: '@ckeditor/ckeditor5-ui': 47.2.0 '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-indent@47.2.0': dependencies: @@ -16309,6 +16331,8 @@ snapshots: '@ckeditor/ckeditor5-widget': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) es-toolkit: 1.39.5 + transitivePeerDependencies: + - supports-color '@ckeditor/ckeditor5-minimap@47.2.0': dependencies: @@ -16692,6 +16716,8 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.2.0 ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) es-toolkit: 1.39.5 + transitivePeerDependencies: + - supports-color '@codemirror/autocomplete@6.18.6': dependencies: @@ -18575,9 +18601,9 @@ snapshots: '@microsoft/tsdoc@0.15.1': {} - '@mind-elixir/node-menu@5.0.1(mind-elixir@5.3.5)': + '@mind-elixir/node-menu@5.0.1(mind-elixir@5.3.6)': dependencies: - mind-elixir: 5.3.5 + mind-elixir: 5.3.6 '@mixmark-io/domino@2.2.0': {} @@ -27043,7 +27069,7 @@ snapshots: mimic-response@3.1.0: {} - mind-elixir@5.3.5: {} + mind-elixir@5.3.6: {} mini-css-extract-plugin@2.4.7(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.0)): dependencies: