Fix enex import stores wrong format in database for dateCreated, dateModified (#7718)

to protect from future potential refactoring

.nvmrc

@@ -1 +1 @@
-24.11.0
+24.11.1

_regroup/package.json

@@ -38,7 +38,7 @@
     "@playwright/test": "1.56.1",
     "@stylistic/eslint-plugin": "5.5.0",        
     "@types/express": "5.0.5",    
-    "@types/node": "24.10.0",    
+    "@types/node": "24.10.1",    
     "@types/yargs": "17.0.34",
     "@vitest/coverage-v8": "3.2.4",
     "eslint": "9.39.1",

apps/build-docs/package.json

@@ -9,7 +9,7 @@
   "keywords": [],
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.21.0",
+  "packageManager": "pnpm@10.22.0",
   "devDependencies": {
     "@redocly/cli": "2.11.1",
     "archiver": "7.0.1",

apps/client/package.json

@@ -59,7 +59,7 @@
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "preact": "10.27.2",
-    "react-i18next": "16.2.4",
+    "react-i18next": "16.3.1",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",

apps/client/src/entities/fnote.ts

@@ -6,6 +6,7 @@ import type { Froca } from "../services/froca-interface.js";
 import type FAttachment from "./fattachment.js";
 import type { default as FAttribute, AttributeType } from "./fattribute.js";
 import utils from "../services/utils.js";
+import search from "../services/search.js";
 
 const LABEL = "label";
 const RELATION = "relation";
@@ -255,6 +256,21 @@ export default class FNote {
         return this.children;
     }
 
+    async getChildNoteIdsWithArchiveFiltering(includeArchived = false) {
+        if (!includeArchived) {
+            const unorderedIds = new Set(await search.searchForNoteIds(`note.parents.noteId="${this.noteId}" #!archived`));
+            const results: string[] = [];
+            for (const id of this.children) {
+                if (unorderedIds.has(id)) {
+                    results.push(id);
+                }
+            }
+            return results;
+        } else {
+            return this.children;
+        }
+    }
+
     async getSubtreeNoteIds(includeArchived = false) {
         let noteIds: (string | string[])[] = [];
         for (const child of await this.getChildNotes()) {
@@ -839,8 +855,7 @@ export default class FNote {
             return [];
         }
 
-        const promotedAttrs = this.getAttributes()
-            .filter((attr) => attr.isDefinition())
+        const promotedAttrs = this.getAttributeDefinitions()
             .filter((attr) => {
                 const def = attr.getDefinition();
 
@@ -860,6 +875,11 @@ export default class FNote {
         return promotedAttrs;
     }
 
+    getAttributeDefinitions() {
+        return this.getAttributes()
+            .filter((attr) => attr.isDefinition());
+    }
+
     hasAncestor(ancestorNoteId: string, followTemplates = false, visitedNoteIds: Set<string> | null = null) {
         if (this.noteId === ancestorNoteId) {
             return true;

apps/client/src/layouts/desktop_layout.tsx

@@ -3,7 +3,7 @@ import { DESKTOP_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.
 import ApiLog from "../widgets/api_log.jsx";
 import ClosePaneButton from "../widgets/buttons/close_pane_button.js";
 import CloseZenModeButton from "../widgets/close_zen_button.jsx";
-import ContentHeader from "../widgets/containers/content-header.js";
+import ContentHeader from "../widgets/containers/content_header.js";
 import CreatePaneButton from "../widgets/buttons/create_pane_button.js";
 import FindWidget from "../widgets/find.js";
 import FlexContainer from "../widgets/containers/flex_container.js";

apps/client/src/layouts/mobile_layout.tsx

@@ -10,7 +10,7 @@ import LauncherContainer from "../widgets/containers/launcher_container.js";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
 import NoteList from "../widgets/collections/NoteList.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
-import ContentHeader from "../widgets/containers/content-header.js";
+import ContentHeader from "../widgets/containers/content_header.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
 import PromotedAttributesWidget from "../widgets/promoted_attributes.js";

apps/client/src/services/attribute_renderer.ts

@@ -90,7 +90,8 @@ const HIDDEN_ATTRIBUTES = [
     "viewType",
     "geolocation",
     "docName",
-    "webViewSrc"
+    "webViewSrc",
+    "archived"
 ];
 
 async function renderNormalAttributes(note: FNote) {

apps/client/src/services/css_class_manager.ts

@@ -76,6 +76,11 @@ function getHue(color: ColorInstance) {
     }
 }
 
+export function getReadableTextColor(bgColor: string) {
+    const colorInstance = Color(bgColor);
+    return colorInstance.isLight() ? "#000" : "#fff";
+}
+
 export default {
     createClassForColor
 };

apps/client/src/translations/cn/translation.json

@@ -690,7 +690,8 @@
     "convert_into_attachment_failed": "笔记 '{{title}}' 转换失败。",
     "convert_into_attachment_successful": "笔记 '{{title}}' 已成功转换为附件。",
     "convert_into_attachment_prompt": "确定要将笔记 '{{title}}' 转换为父笔记的附件吗？",
-    "print_pdf": "导出为 PDF..."
+    "print_pdf": "导出为 PDF...",
+    "open_note_on_server": "在服务器上打开笔记"
   },
   "onclick_button": {
     "no_click_handler": "按钮组件'{{componentId}}'没有定义点击处理程序"
@@ -1110,7 +1111,8 @@
     "title": "内容宽度",
     "default_description": "Trilium默认会限制内容的最大宽度以提高在宽屏中全屏时的可读性。",
     "max_width_label": "内容最大宽度(像素)",
-    "max_width_unit": "像素"
+    "max_width_unit": "像素",
+    "centerContent": "保持内容居中"
   },
   "native_title_bar": {
     "title": "原生标题栏（需要重新启动应用）",
@@ -2082,5 +2084,11 @@
   },
   "calendar_view": {
     "delete_note": "删除笔记..."
+  },
+  "read-only-info": {
+    "read-only-note": "当前正在查看一个只读笔记。",
+    "auto-read-only-note": "这条笔记以只读模式显示便于快速加载。",
+    "auto-read-only-learn-more": "了解更多",
+    "edit-note": "编辑笔记"
   }
 }

apps/client/src/translations/ja/translation.json

@@ -41,7 +41,7 @@
     "prefix": "接頭辞: ",
     "branch_prefix_saved": "ブランチの接頭辞が保存されました。",
     "edit_branch_prefix_multiple": "{{count}} ブランチのブランチ接頭辞を編集",
-    "branch_prefix_saved_multiple": "{{count}} 個のブランチのブランチ接頭辞が保存されました。",
+    "branch_prefix_saved_multiple": "{{count}} ブランチのブランチ接頭辞が保存されました。",
     "affected_branches": "影響を受けるブランチ {{count}}:"
   },
   "global_menu": {
@@ -456,7 +456,8 @@
     "convert_into_attachment_failed": "ノート '{{title}}' の変換に失敗しました。",
     "convert_into_attachment_successful": "ノート '{{title}}' は添付ファイルに変換されました。",
     "convert_into_attachment_prompt": "本当にノート '{{title}}' を親ノートの添付ファイルに変換しますか？",
-    "note_attachments": "ノートの添付ファイル"
+    "note_attachments": "ノートの添付ファイル",
+    "open_note_on_server": "サーバー上のノートを開く"
   },
   "command_palette": {
     "export_note_title": "ノートをエクスポート",

apps/client/src/translations/tw/translation.json

@@ -687,7 +687,8 @@
     "convert_into_attachment_failed": "筆記 '{{title}}' 轉換失敗。",
     "convert_into_attachment_successful": "筆記 '{{title}}' 已成功轉換為附件。",
     "convert_into_attachment_prompt": "確定要將筆記 '{{title}}' 轉換為父級筆記的附件嗎？",
-    "print_pdf": "匯出為 PDF…"
+    "print_pdf": "匯出為 PDF…",
+    "open_note_on_server": "在伺服器上開啟筆記"
   },
   "onclick_button": {
     "no_click_handler": "按鈕元件'{{componentId}}'沒有定義點擊時的處理方式"
@@ -1107,7 +1108,8 @@
     "title": "內容寬度",
     "default_description": "Trilium 預設會限制內容的最大寬度以提高在寬螢幕中全螢幕時的可讀性。",
     "max_width_label": "內容最大寬度（像素）",
-    "max_width_unit": "像素"
+    "max_width_unit": "像素",
+    "centerContent": "將內容置中"
   },
   "native_title_bar": {
     "title": "原生標題列（需要重新啟動程式）",
@@ -2082,5 +2084,11 @@
   },
   "calendar_view": {
     "delete_note": "刪除筆記…"
+  },
+  "read-only-info": {
+    "read-only-note": "目前正在檢視唯讀筆記。",
+    "auto-read-only-note": "此筆記以唯讀模式顯示以加快載入速度。",
+    "auto-read-only-learn-more": "了解更多",
+    "edit-note": "編輯筆記"
   }
 }

apps/client/src/widgets/attribute_widgets/PromotedAttributesDisplay.css

@@ -0,0 +1,31 @@
+.promoted-attributes {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+    margin-top: 8px;
+}
+
+.promoted-attributes .promoted-attribute {
+    padding: 2px 10px;
+    border-radius: 9999px;
+    white-space: nowrap;
+    background-color: var(--chip-bg, rgba(0, 0, 0, 0.08));
+    color: var(--chip-fg, inherit);
+    border: 1px solid var(--chip-border, rgba(0, 0, 0, 0.15));
+    font-size: 12px;
+    line-height: 1.2;
+}
+
+.promoted-attributes .promoted-attribute:hover {
+    background-color: var(--chip-bg-hover, rgba(0, 0, 0, 0.12));
+    border-color: var(--chip-border-hover, rgba(0, 0, 0, 0.22));
+}
+
+.promoted-attributes .promoted-attribute .name {
+    font-weight: 600;
+}
+
+.promoted-attributes .promoted-attribute .value {
+    opacity: 0.9;
+}

apps/client/src/widgets/attribute_widgets/PromotedAttributesDisplay.tsx

@@ -0,0 +1,134 @@
+import { useState } from "preact/hooks";
+import FNote from "../../entities/fnote";
+import "./PromotedAttributesDisplay.css";
+import { useTriliumEvent } from "../react/hooks";
+import attributes from "../../services/attributes";
+import { DefinitionObject } from "../../services/promoted_attribute_definition_parser";
+import { formatDateTime } from "../../utils/formatters";
+import { ComponentChild, ComponentChildren, CSSProperties } from "preact";
+import Icon from "../react/Icon";
+import NoteLink from "../react/NoteLink";
+import { getReadableTextColor } from "../../services/css_class_manager";
+
+interface PromotedAttributesDisplayProps {
+    note: FNote;
+    ignoredAttributes?: string[];
+}
+
+interface AttributeWithDefinitions {
+    friendlyName: string;
+    name: string;
+    type: string;
+    value: string;
+    def: DefinitionObject;
+}
+
+export default function PromotedAttributesDisplay({ note, ignoredAttributes }: PromotedAttributesDisplayProps) {
+    const promotedDefinitionAttributes = useNoteAttributesWithDefinitions(note, ignoredAttributes);
+    return promotedDefinitionAttributes?.length > 0 && (
+        <div className="promoted-attributes">
+            {promotedDefinitionAttributes?.map(attr => buildPromotedAttribute(attr))}
+        </div>
+    )
+
+}
+
+function useNoteAttributesWithDefinitions(note: FNote, attributesToIgnore:  string[] = []): AttributeWithDefinitions[] {
+    const [ promotedDefinitionAttributes, setPromotedDefinitionAttributes ] = useState<AttributeWithDefinitions[]>(getAttributesWithDefinitions(note, attributesToIgnore));
+
+    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
+        if (loadResults.getAttributeRows().some(attr => attributes.isAffecting(attr, note))) {
+            setPromotedDefinitionAttributes(getAttributesWithDefinitions(note, attributesToIgnore));
+        }
+    });
+
+    return promotedDefinitionAttributes;
+}
+
+function PromotedAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
+    const className = `${attr.type === "label" ? "label" + " " + attr.def.labelType : "relation"}`;
+
+    return (
+        <span key={attr.friendlyName} className={`promoted-attribute type-${className}`} style={style}>
+            {children}
+        </span>
+    )
+}
+
+function buildPromotedAttribute(attr: AttributeWithDefinitions): ComponentChildren {
+    const defaultLabel = <><strong>{attr.friendlyName}:</strong>{" "}</>;
+    let content: ComponentChildren;
+    let style: CSSProperties | undefined;
+
+    if (attr.type === "label") {
+        let value = attr.value;
+        switch (attr.def.labelType) {
+            case "number":
+                let formattedValue = value;
+                const numberValue = Number(value);
+                if (!Number.isNaN(numberValue) && attr.def.numberPrecision) formattedValue = numberValue.toFixed(attr.def.numberPrecision);
+                content = <>{defaultLabel}{formattedValue}</>;
+                break;
+            case "date":
+            case "datetime": {
+                const date = new Date(value);
+                const timeFormat = attr.def.labelType !== "date" ? "short" : "none";
+                const formattedValue = formatDateTime(date, "short", timeFormat);
+                content = <>{defaultLabel}{formattedValue}</>;
+                break;
+            }
+            case "time": {
+                const date = new Date(`1970-01-01T${value}Z`);
+                const formattedValue = formatDateTime(date, "none", "short");
+                content = <>{defaultLabel}{formattedValue}</>;
+                break;
+            }
+            case "boolean":
+                content = <><Icon icon={value === "true" ? "bx bx-check-square" : "bx bx-square"} />{" "}<strong>{attr.friendlyName}</strong></>;
+                break;
+            case "url":
+                content = <a href={value} target="_blank" rel="noopener noreferrer">{attr.friendlyName}</a>;
+                break;
+            case "color":
+                style = { backgroundColor: value, color: getReadableTextColor(value) };
+                content = <>{attr.friendlyName}</>;
+                break;
+            case "text":
+            default:
+                content = <>{defaultLabel}{value}</>;
+                break;
+        }
+    } else if (attr.type === "relation") {
+        content = <>{defaultLabel}<NoteLink notePath={attr.value} showNoteIcon /></>;
+    }
+
+    return <PromotedAttribute attr={attr} style={style}>{content}</PromotedAttribute>
+}
+
+function getAttributesWithDefinitions(note: FNote, attributesToIgnore: string[] = []): AttributeWithDefinitions[] {
+    const promotedDefinitionAttributes = note.getAttributeDefinitions();
+    const result: AttributeWithDefinitions[] = [];
+    for (const attr of promotedDefinitionAttributes) {
+        const def = attr.getDefinition();
+        const [ type, name ] = attr.name.split(":", 2);
+        const friendlyName = def?.promotedAlias || name;
+        const props: Omit<AttributeWithDefinitions, "value"> = { def, name, type, friendlyName };
+
+        if (attributesToIgnore.includes(name)) continue;
+
+        if (type === "label") {
+            const labels = note.getLabels(name);
+            for (const label of labels) {
+                if (!label.value) continue;
+                result.push({ ...props, value: label.value } );
+            }
+        } else if (type === "relation") {
+            const relations = note.getRelations(name);
+            for (const relation of relations) {
+                if (!relation.value) continue;
+                result.push({ ...props, value: relation.value } );
+            }
+        }
+    }
+    return result;
+}

apps/client/src/widgets/collections/NoteList.tsx

@@ -141,7 +141,7 @@ export function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOpt
 
     async function getNoteIds(note: FNote) {
         if (viewType === "list" || viewType === "grid" || viewType === "table" || note.type === "search") {
-            return note.getChildNoteIds();
+            return await note.getChildNoteIdsWithArchiveFiltering(includeArchived);
         } else {
             return await note.getSubtreeNoteIds(includeArchived);
         }

apps/client/src/widgets/collections/board/api.ts

@@ -16,7 +16,7 @@ export default class BoardApi {
         private byColumn: ColumnMap | undefined,
         public columns: string[],
         private parentNote: FNote,
-        private statusAttribute: string,
+        readonly statusAttribute: string,
         private viewConfig: BoardViewData,
         private saveConfig: (newConfig: BoardViewData) => void,
         private setBranchIdToEdit: (branchId: string | undefined) => void

apps/client/src/widgets/collections/board/card.tsx

@@ -6,6 +6,7 @@ import { BoardViewContext, TitleEditor } from ".";
 import { ContextMenuEvent } from "../../../menus/context_menu";
 import { openNoteContextMenu } from "./context_menu";
 import { t } from "../../../services/i18n";
+import PromotedAttributesDisplay from "../../attribute_widgets/PromotedAttributesDisplay";
 
 export const CARD_CLIPBOARD_TYPE = "trilium/board-card";
 
@@ -108,6 +109,7 @@ export default function Card({
                         title={t("board_view.edit-note-title")}
                         onClick={handleEdit}
                     />
+                    <PromotedAttributesDisplay note={note} ignoredAttributes={[api.statusAttribute]} />
                 </>
             ) : (
                 <TitleEditor

apps/client/src/widgets/collections/board/column.tsx

@@ -104,6 +104,8 @@ export default function Column({
                 {!isEditing ? (
                     <>
                         <span className="title">{column}</span>
+                        <span className="counter-badge">{columnItems?.length ?? 0}</span>
+                        <div className="spacer" />
                         <span
                             className="edit-icon icon bx bx-edit-alt"
                             title={t("board_view.edit-column-title")}

apps/client/src/widgets/collections/board/index.css

@@ -53,7 +53,16 @@
   align-items: center;
 }
 
-.board-view-container .board-column h3 > .title {
+.board-view-container .board-column h3 .counter-badge {
+  background-color: var(--muted-text-color);
+  color: var(--main-background-color);
+  border-radius: 12px;
+  padding: 0.1em 0.6em;
+  font-size: 0.75em;
+  margin-inline-start: 0.5em;
+}
+
+.board-view-container .board-column h3 > .spacer {
   flex-grow: 1;
 }
 

apps/client/src/widgets/collections/legacy/ListOrGridView.css

@@ -16,6 +16,10 @@
     flex-grow: 1;
 }
 
+.note-book-card.archived {
+    opacity: 0.5;
+}
+
 .note-book-card:not(.expanded) .note-book-content {
     padding: 10px
 }

apps/client/src/widgets/collections/legacy/ListOrGridView.tsx

@@ -64,7 +64,7 @@ function ListNoteCard({ note, parentNote, expand, highlightedTokens }: { note: F
 
     return (
         <div
-            className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""}`}
+            className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""} ${note.isArchived ? "archived" : ""}`}
             data-note-id={note.noteId}
         >
             <h5 className="note-book-header">
@@ -100,7 +100,7 @@ function GridNoteCard({ note, parentNote, highlightedTokens }: { note: FNote, pa
 
     return (
         <div
-            className={`note-book-card no-tooltip-preview block-link`}
+            className={`note-book-card no-tooltip-preview block-link ${note.isArchived ? "archived" : ""}`}
             data-href={`#${notePath}`}
             data-note-id={note.noteId}
             onClick={(e) => link.goToLink(e)}

apps/client/src/widgets/containers/content_header.ts

@@ -15,6 +15,7 @@ export default class ContentHeader extends Container<BasicWidget> {
     constructor() {
         super();
 
+        this.class("content-header-widget");
         this.css("contain", "unset");
         this.resizeObserver = new ResizeObserver(this.onResize.bind(this));
     }

apps/client/src/widgets/react/hooks.tsx

@@ -406,14 +406,17 @@ export function useNoteLabelWithDefault(note: FNote | undefined | null, labelNam
 }
 
 export function useNoteLabelBoolean(note: FNote | undefined | null, labelName: FilterLabelsByType<boolean>): [ boolean, (newValue: boolean) => void] {
-    const [ labelValue, setLabelValue ] = useState<boolean>(!!note?.hasLabel(labelName));
+    const [, forceRender] = useState({});
 
-    useEffect(() => setLabelValue(!!note?.hasLabel(labelName)), [ note ]);
+    useEffect(() => {
+        forceRender({});
+    }, [ note ]);
 
     useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
         for (const attr of loadResults.getAttributeRows()) {
             if (attr.type === "label" && attr.name === labelName && attributes.isAffecting(attr, note)) {
-                setLabelValue(!attr.isDeleted);
+                forceRender({});
+                break;
             }
         }
     });
@@ -430,6 +433,7 @@ export function useNoteLabelBoolean(note: FNote | undefined | null, labelName: F
 
     useDebugValue(labelName);
 
+    const labelValue = !!note?.hasLabel(labelName);
     return [ labelValue, setter ] as const;
 }
 

apps/client/src/widgets/ribbon/CollectionPropertiesTab.tsx

@@ -59,13 +59,12 @@ function CollectionTypeSwitcher({ viewType, setViewType }: { viewType: string, s
 function BookProperties({ viewType, note, properties }: { viewType: ViewTypeOptions, note: FNote, properties: BookProperty[] }) {
   return (
     <>
-      {properties.map(property => (
+        {properties.map(property => (
         <div className={`type-${property}`}>
-          {mapPropertyView({ note, property })}
+            {mapPropertyView({ note, property })}
         </div>
-      ))}
+        ))}
 
-      {viewType !== "list" && viewType !== "grid" && (
         <CheckboxPropertyView
             note={note} property={{
                 bindToLabel: "includeArchived",
@@ -73,7 +72,6 @@ function BookProperties({ viewType, note, properties }: { viewType: ViewTypeOpti
                 type: "checkbox"
             }}
         />
-      )}
     </>
   )
 }

apps/client/src/widgets/ribbon/collection-properties-config.ts

@@ -81,7 +81,7 @@ export const bookPropertiesConfig: Record<ViewTypeOptions, BookConfig> = {
                         await attributes.removeAttributeById(noteId, expandedAttr.attributeId);
                     }
 
-                    triggerCommand("refreshNoteList", { noteId: noteId });
+                    triggerCommand("refreshNoteList", { noteId });
                 },
             },
             {

apps/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.11.0-bullseye-slim AS builder
+FROM node:24.11.1-bullseye-slim AS builder
 RUN corepack enable
 
 # Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
 
-FROM node:24.11.0-bullseye-slim
+FROM node:24.11.1-bullseye-slim
 # Install only runtime dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

apps/server/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM node:24.11.0-alpine AS builder
+FROM node:24.11.1-alpine AS builder
 RUN corepack enable
 
 # Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
 
-FROM node:24.11.0-alpine
+FROM node:24.11.1-alpine
 # Install runtime dependencies
 RUN apk add --no-cache su-exec shadow
 

apps/server/Dockerfile.alpine.rootless

@@ -1,4 +1,4 @@
-FROM node:24.11.0-alpine AS builder
+FROM node:24.11.1-alpine AS builder
 RUN corepack enable
 
 # Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
 
-FROM node:24.11.0-alpine
+FROM node:24.11.1-alpine
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001

apps/server/Dockerfile.rootless

@@ -1,4 +1,4 @@
-FROM node:24.11.0-bullseye-slim AS builder
+FROM node:24.11.1-bullseye-slim AS builder
 RUN corepack enable
 
 # Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
 
-FROM node:24.11.0-bullseye-slim
+FROM node:24.11.1-bullseye-slim
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001

apps/server/package.json

@@ -104,7 +104,7 @@
     "is-animated": "2.0.2",
     "is-svg": "6.1.0",
     "jimp": "1.6.0",
-    "js-yaml": "4.1.0",
+    "js-yaml": "4.1.1",
     "marked": "16.4.2",
     "mime-types": "3.0.1",
     "multer": "2.0.2",

apps/server/src/assets/translations/cn/server.json

@@ -258,7 +258,9 @@
     "jump-to-note-title": "跳转至...",
     "llm-chat-title": "与笔记聊天",
     "ai-llm-title": "AI/LLM",
-    "inbox-title": "收件箱"
+    "inbox-title": "收件箱",
+    "command-palette": "打开命令面板",
+    "zen-mode": "禅模式"
   },
   "notes": {
     "new-note": "新建笔记",

apps/server/src/assets/translations/ko/server.json

@@ -43,6 +43,26 @@
   },
   "hidden-subtree": {
     "zen-mode": "젠 모드",
-    "open-today-journal-note-title": "오늘의 일지 기록 열기"
+    "open-today-journal-note-title": "오늘의 일지 기록 열기",
+    "quick-search-title": "빠른 검색",
+    "protected-session-title": "보호된 세션",
+    "sync-status-title": "동기화 상태",
+    "settings-title": "설정",
+    "llm-chat-title": "기록과 대화하기",
+    "options-title": "옵션",
+    "appearance-title": "모양",
+    "shortcuts-title": "바로가기",
+    "text-notes": "텍스트 노트",
+    "code-notes-title": "코드 노트",
+    "images-title": "그림",
+    "spellcheck-title": "맞춤법 검사",
+    "password-title": "암호",
+    "multi-factor-authentication-title": "다중 인증",
+    "etapi-title": "ETAPI",
+    "backup-title": "백업",
+    "sync-title": "동기화",
+    "ai-llm-title": "AI/LLM",
+    "other": "기타",
+    "advanced-title": "고급"
   }
 }

apps/server/src/assets/translations/tw/server.json

@@ -355,7 +355,9 @@
     "visible-launchers-title": "可見啟動器",
     "user-guide": "用戶說明",
     "localization": "語言和區域",
-    "inbox-title": "收件匣"
+    "inbox-title": "收件匣",
+    "command-palette": "打開命令面板",
+    "zen-mode": "禪模式"
   },
   "notes": {
     "new-note": "新增筆記",

apps/server/src/services/date_utils.ts

@@ -91,9 +91,12 @@ function validateUtcDateTime(str: string | undefined) {
 }
 
 export default {
+    LOCAL_DATETIME_FORMAT,
+    UTC_DATETIME_FORMAT,
     utcNowDateTime,
     localNowDateTime,
     localNowDate,
+
     utcDateStr,
     utcDateTimeStr,
     parseDateTime,

apps/server/src/services/import/enex.ts

@@ -1,8 +1,10 @@
+import dayjs from "dayjs";
 import sax from "sax";
 import stream from "stream";
 import { Throttle } from "stream-throttle";
 import log from "../log.js";
 import { md5, escapeHtml, fromBase64 } from "../utils.js";
+import date_utils from "../date_utils.js";
 import sql from "../sql.js";
 import noteService from "../notes.js";
 import imageService from "../image.js";
@@ -235,6 +237,8 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN
 
     function updateDates(note: BNote, utcDateCreated?: string, utcDateModified?: string) {
         // it's difficult to force custom dateCreated and dateModified to Note entity, so we do it post-creation with SQL
+        const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated, false);
+        const dateModified = formatDateTimeToLocalDbFormat(utcDateModified, false);
         sql.execute(
             `
                 UPDATE notes
@@ -243,7 +247,7 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN
                     dateModified = ?,
                     utcDateModified = ?
                 WHERE noteId = ?`,
-            [utcDateCreated, utcDateCreated, utcDateModified, utcDateModified, note.noteId]
+            [dateCreated, utcDateCreated, dateModified, utcDateModified, note.noteId]
         );
 
         sql.execute(
@@ -407,4 +411,21 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN
     });
 }
 
+function formatDateTimeToLocalDbFormat(
+    utcDateFromEnex: Date | string | null | undefined,
+    keepUtc: boolean
+): string | undefined {
+    if (!utcDateFromEnex) {
+        return undefined;
+    }
+
+    const parsedDate = dayjs(utcDateFromEnex);
+
+    if (!parsedDate.isValid()) {
+        return undefined;
+    }
+
+    return (keepUtc ? parsedDate.utc() : parsedDate).format(date_utils.LOCAL_DATETIME_FORMAT);
+}
+
 export default { importEnex };

apps/server/src/services/search/expressions/note_content_fulltext.ts

@@ -113,7 +113,16 @@ class NoteContentFulltextExp extends Expression {
                 const normalizedFlatText = normalizeSearchText(flatText);
 
                 // Check if =phrase appears in flatText (indicates attribute value match)
-                matches = normalizedFlatText.includes(`=${normalizedPhrase}`);
+                // For single words, use word-boundary matching to avoid substring matches
+                if (!normalizedPhrase.includes(' ')) {
+                    // Single word: look for =word with word boundaries
+                    // Split by = to get attribute values, then check each value for exact word match
+                    const parts = normalizedFlatText.split('=');
+                    matches = parts.slice(1).some(part => this.exactWordMatch(normalizedPhrase, part));
+                } else {
+                    // Multi-word phrase: check for substring match
+                    matches = normalizedFlatText.includes(`=${normalizedPhrase}`);
+                }
 
                 if ((this.operator === "=" && matches) || (this.operator === "!=" && !matches)) {
                     resultNoteSet.add(noteFromBecca);
@@ -124,6 +133,17 @@ class NoteContentFulltextExp extends Expression {
         return resultNoteSet;
     }
 
+    /**
+     * Helper method to check if a single word appears as an exact match in text
+     * @param wordToFind - The word to search for (should be normalized)
+     * @param text - The text to search in (should be normalized)
+     * @returns true if the word is found as an exact match (not substring)
+     */
+    private exactWordMatch(wordToFind: string, text: string): boolean {
+        const words = text.split(/\s+/);
+        return words.some(word => word === wordToFind);
+    }
+
     /**
      * Checks if content contains the exact word (with word boundaries) or exact phrase
      * This is case-insensitive since content and token are already normalized
@@ -139,9 +159,8 @@ class NoteContentFulltextExp extends Expression {
             return normalizedContent.includes(normalizedToken);
         }
 
-        // For single words, split content into words and check for exact match
-        const words = normalizedContent.split(/\s+/);
-        return words.some(word => word === normalizedToken);
+        // For single words, use exact word matching to avoid substring matches
+        return this.exactWordMatch(normalizedToken, normalizedContent);
     }
 
     /**
@@ -155,7 +174,14 @@ class NoteContentFulltextExp extends Expression {
         // Join tokens with single space to form the phrase
         const phrase = normalizedTokens.join(" ");
 
-        // Check if the phrase appears as a substring (consecutive words)
+        // For single-word phrases, use word-boundary matching to avoid substring matches
+        // e.g., "asd" should not match "asdfasdf"
+        if (!phrase.includes(' ')) {
+            // Single word: use exact word matching to avoid substring matches
+            return this.exactWordMatch(phrase, normalizedContent);
+        }
+
+        // For multi-word phrases, check if the phrase appears as consecutive words
         if (normalizedContent.includes(phrase)) {
             return true;
         }

apps/website/package.json

@@ -14,7 +14,7 @@
 		"preact": "10.27.2",
 		"preact-iso": "2.11.0",
 		"preact-render-to-string": "6.6.3",
-		"react-i18next": "16.2.4"
+		"react-i18next": "16.3.1"
 	},
 	"devDependencies": {
 		"@preact/preset-vite": "2.10.2",

apps/website/src/translations/pl/translation.json

@@ -51,7 +51,7 @@
         "mermaid_description": "Twórz diagramy, takie jak schematy blokowe, diagramy klas i sekwencyjne, wykresy Gantta i wiele innych, korzystając z składni Mermaid.",
         "mindmap_title": "Mapy myśli",
         "mindmap_description": "Organizuj wizualnie swoje myśli albo przeprowadź sesję burzy mózgów.",
-        "others_list": "I wiele innych: <0>mapa notatek</0>, <1>mapa powiązań</1>, <2>zapisane wyszukiwania</2>, <3>renderowane notatki</3>, and <4>podgląd stron www</4>.",
+        "others_list": "I wiele innych: <0>mapa notatek</0>, <1>mapa powiązań</1>, <2>zapisane wyszukiwania</2>, <3>renderowane notatki</3> i <4>podgląd stron www</4>.",
         "title": "Wiele sposobów przedstawienia Twoich informacji"
     },
     "extensibility_benefits": {
@@ -132,7 +132,7 @@
         "title": "Inne sposoby wsparcia",
         "way_translate": "Przetłumacz aplikacja na swój natywny język przez <Link>Weblate</Link>.",
         "way_community": "Dołącz do społeczności na <Discussions>GitHub Discussions</Discussions> lub na <Matrix>Matrix</Matrix>.",
-        "way_reports": "Zgłoś błędy przez<Link>GitHub issues</Link>.",
+        "way_reports": "Zgłoś błędy przez <Link>GitHub issues</Link>.",
         "way_document": "Pomóż nam w doskonaleniu dokumentacji przez informowanie nas o lukach albo sam pomóż w tworzeniu treści (dokumentacja, FAQ, poradniki).",
         "way_market": "Powiedz o nas swoim znajomym, na blogu albo na social mediach."
     },

docs/README-sv.md

@@ -28,14 +28,14 @@ status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted
 Trilium Notes is a free and open-source, cross-platform hierarchical note taking
 application with focus on building large personal knowledge bases.
 
-See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for
-quick overview:
+Se [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) för en
+snabb överblick:
 
 <a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>
 
-## ⏬ Download
+## Ladda ner
 - [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
-  stable version, recommended for most users.
+  stabil version, rekommenderas för dom flesta användare.
 - [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
   unstable development version, updated daily with the latest features and
   fixes.

package.json

@@ -43,7 +43,7 @@
     "@playwright/test": "1.56.1",
     "@triliumnext/server": "workspace:*",
     "@types/express": "5.0.5",
-    "@types/node": "24.10.0",
+    "@types/node": "24.10.1",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
     "chalk": "5.6.2",
@@ -83,7 +83,7 @@
     "url": "https://github.com/TriliumNext/Trilium/issues"
   },
   "homepage": "https://triliumnotes.org",
-  "packageManager": "pnpm@10.21.0",
+  "packageManager": "pnpm@10.22.0",
   "pnpm": {
     "patchedDependencies": {
       "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",

packages/ckeditor5/package.json

@@ -15,7 +15,7 @@
     "ckeditor5-premium-features": "47.2.0"
   },
   "devDependencies": {
-    "@smithy/middleware-retry": "4.4.7",
+    "@smithy/middleware-retry": "4.4.10",
     "@types/jquery": "3.5.33"
   }
 }