index label ids on typesense

* feat: page attachments endpoint

* feat: attachments modal

.npmrc

@@ -1 +0,0 @@
-shamefully-hoist = true

Dockerfile

@@ -1,7 +1,7 @@
-FROM node:22-slim AS base
+FROM node:26-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"
 
-RUN npm install -g pnpm@10.4.0
+RUN npm install -g pnpm@11.15.1
 
 FROM base AS builder
 
@@ -34,7 +34,6 @@ COPY --from=builder /app/packages/base-formula/package.json /app/packages/base-f
 # Copy root package files
 COPY --from=builder /app/package.json /app/package.json
 COPY --from=builder /app/pnpm*.yaml /app/
-COPY --from=builder /app/.npmrc /app/.npmrc
 
 # Copy patches
 COPY --from=builder /app/patches /app/patches
@@ -43,7 +42,7 @@ RUN chown -R node:node /app
 
 USER node
 
-RUN pnpm install --frozen-lockfile --prod
+RUN pnpm install --frozen-lockfile --prod && rm -rf /home/node/.cache/pnpm
 
 RUN mkdir -p /app/data/storage
 

apps/client/package.json

@@ -36,7 +36,7 @@
     "@tanstack/react-table": "8.21.3",
     "@tanstack/react-virtual": "3.14.3",
     "alfaaz": "1.1.0",
-    "axios": "1.16.0",
+    "axios": "1.18.1",
     "blueimp-load-image": "5.16.0",
     "clsx": "2.1.1",
     "file-saver": "2.0.5",
@@ -50,9 +50,9 @@
     "katex": "0.16.40",
     "lowlight": "3.3.0",
     "mantine-form-zod-resolver": "1.3.0",
-    "mermaid": "11.15.0",
+    "mermaid": "11.16.1",
     "mitt": "3.0.1",
-    "nanoid": "3.3.8",
+    "nanoid": "3.3.17",
     "posthog-js": "1.391.2",
     "react": "19.2.7",
     "react-clear-modal": "^2.0.18",
@@ -61,7 +61,7 @@
     "react-error-boundary": "6.1.1",
     "react-helmet-async": "3.0.0",
     "react-i18next": "16.5.8",
-    "react-router-dom": "7.18.0",
+    "react-router-dom": "7.18.2",
     "semver": "7.7.4",
     "socket.io-client": "4.8.3",
     "zod": "4.3.6"
@@ -86,7 +86,7 @@
     "globals": "15.13.0",
     "jsdom": "25.0.0",
     "optics-ts": "2.4.1",
-    "postcss": "8.5.14",
+    "postcss": "8.5.25",
     "postcss-preset-mantine": "1.18.0",
     "postcss-simple-vars": "7.0.1",
     "prettier": "3.8.1",

apps/client/public/locales/de-DE/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Eigenschaft erstellen",
   "Hide properties": "Eigenschaften ausblenden",
   "Find a property type": "Einen Eigenschaftstyp finden",
-  "Properties": "Eigenschaften"
+  "Properties": "Eigenschaften",
+  "A property with this name already exists": "Eine Eigenschaft mit diesem Namen existiert bereits",
+  "Add card": "Karte hinzufügen",
+  "Add filter": "Filter hinzufügen",
+  "Add option": "Option hinzufügen",
+  "Add sort": "Sortierung hinzufügen",
+  "Add view": "Ansicht hinzufügen",
+  "All data in this column will be lost.": "Alle Daten in dieser Spalte gehen verloren.",
+  "Allow multiple people": "Mehrere Personen zulassen",
+  "Alphabetize": "Alphabetisch sortieren",
+  "Are you sure you want to delete": "Sind Sie sicher, dass Sie löschen möchten",
+  "Ascending": "Aufsteigend",
+  "Base deleted": "Base gelöscht",
+  "Base name": "Base-Name",
+  "Base table": "Base-Tabelle",
+  "Card properties": "Karteneigenschaften",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Zellen, die das Textlimit überschreiten, werden abgeschnitten und der zusätzliche Inhalt geht dauerhaft verloren.",
+  "Checkbox": "Kontrollkästchen",
+  "Checked by default": "Standardmäßig aktiviert",
+  "Choose a property": "Wählen Sie eine Eigenschaft",
+  "Clear selection": "Auswahl aufheben",
+  "Column options": "Spaltenoptionen",
+  "Comma, period": "Komma, Punkt",
+  "Complete": "Abgeschlossen",
+  "Contains": "Enthält",
+  "Copy link to view": "Link zur Ansicht kopieren",
+  "Create a status property": "Eine Statuseigenschaft erstellen",
+  "Created at": "Erstellt am",
+  "Currency": "Währung",
+  "Decimal places": "Dezimalstellen",
+  "Default value": "Standardwert",
+  "Delete property": "Eigenschaft löschen",
+  "Delete view": "Ansicht löschen",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Absteigend",
+  "Discard": "Verwerfen",
+  "Doesn't contain": "Enthält nicht",
+  "Done": "Fertig",
+  "Edit formula": "Formel bearbeiten",
+  "Edit property": "Eigenschaft bearbeiten",
+  "Export CSV": "CSV exportieren",
+  "Failed to load base": "Base konnte nicht geladen werden",
+  "False": "Falsch",
+  "File": "Datei",
+  "Filter and sort changes are visible only to you": "Änderungen an Filtern und Sortierungen sind nur für Sie sichtbar",
+  "Filter by": "Filtern nach",
+  "Formula": "Formel",
+  "Get started with": "Erste Schritte mit",
+  "Greater than": "Größer als",
+  "Group by": "Gruppieren nach",
+  "Group this board by a select or status property.": "Gruppieren Sie dieses Board nach einer Auswahl- oder Statuseigenschaft.",
+  "Hide all": "Alle ausblenden",
+  "Hide group": "Gruppe ausblenden",
+  "In Progress": "In Bearbeitung",
+  "In progress": "In Bearbeitung",
+  "Include time": "Uhrzeit einschließen",
+  "Insert a kanban board on this page": "Fügen Sie ein Kanban-Board auf dieser Seite ein",
+  "Insert an inline base on this page": "Fügen Sie eine Inline-Base auf dieser Seite ein",
+  "Is": "Ist",
+  "Is after": "Ist nach",
+  "Is any of": "Ist eines von",
+  "Is before": "Ist vor",
+  "Is empty": "Ist leer",
+  "Is none of": "Ist keines von",
+  "Is not": "Ist nicht",
+  "Is not empty": "Ist nicht leer",
+  "Is on or after": "Ist am oder nach",
+  "Is on or before": "Ist am oder vor",
+  "Is within": "Ist innerhalb von",
+  "Keep editing": "Weiter bearbeiten",
+  "Last edited at": "Zuletzt bearbeitet am",
+  "Last edited by": "Zuletzt bearbeitet von",
+  "Less than": "Kleiner als",
+  "Link copied to clipboard": "Link in die Zwischenablage kopiert",
+  "Local": "Lokal",
+  "Long text": "Langer Text",
+  "Moved card to {{column}}": "Karte nach {{column}} verschoben",
+  "Moved column to {{column}}": "Spalte nach {{column}} verschoben",
+  "Multi-select": "Mehrfachauswahl",
+  "New row": "Neue Zeile",
+  "Next month": "Nächster Monat",
+  "Next week": "Nächste Woche",
+  "Next year": "Nächstes Jahr",
+  "No filters applied": "Keine Filter angewendet",
+  "No match": "Keine Übereinstimmung",
+  "No options for this property type": "Keine Optionen für diesen Eigenschaftstyp",
+  "No sorts applied": "Keine Sortierungen angewendet",
+  "No value": "Kein Wert",
+  "None": "Keine",
+  "Not started": "Nicht begonnen",
+  "Number": "Zahl",
+  "One month ago": "Vor einem Monat",
+  "One month from now": "In einem Monat",
+  "One week ago": "Vor einer Woche",
+  "One week from now": "In einer Woche",
+  "Open as page": "Als Seite öffnen",
+  "Options": "Optionen",
+  "Past month": "Letzter Monat",
+  "Past week": "Letzte Woche",
+  "Past year": "Letztes Jahr",
+  "Percent": "Prozent",
+  "Period, comma": "Punkt, Komma",
+  "Person": "Person",
+  "Please enter a valid email": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
+  "Progress": "Fortschritt",
+  "Property options": "Eigenschaftsoptionen",
+  "Relative": "Relativ",
+  "Rename property": "Eigenschaft umbenennen",
+  "Reset": "Zurücksetzen",
+  "Save for everyone": "Für alle speichern",
+  "Select": "Auswahl",
+  "Select a property": "Eigenschaft auswählen",
+  "Select all loaded rows": "Alle geladenen Zeilen auswählen",
+  "Show all": "Alle anzeigen",
+  "Sort": "Sortieren",
+  "Sort by": "Sortieren nach",
+  "Space, comma": "Leerzeichen, Komma",
+  "Space, period": "Leerzeichen, Punkt",
+  "This board has no grouping property yet.": "Dieses Board hat noch keine Gruppierungseigenschaft.",
+  "This month": "Diesen Monat",
+  "This year": "Dieses Jahr",
+  "Thousands and decimal separators": "Tausender- und Dezimaltrennzeichen",
+  "Time format": "Zeitformat",
+  "To Do": "Zu erledigen",
+  "Tomorrow": "Morgen",
+  "True": "Wahr",
+  "Unsaved changes": "Nicht gespeicherte Änderungen",
+  "Untitled base": "Unbenannte Base",
+  "URL": "URL",
+  "Value": "Wert",
+  "View updated for everyone": "Ansicht für alle aktualisiert",
+  "You have unsaved changes. Do you want to discard them?": "Sie haben nicht gespeicherte Änderungen. Möchten Sie sie verwerfen?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/en-US/translation.json

@@ -387,6 +387,8 @@
   "Insert horizontal rule divider": "Insert horizontal rule divider",
   "Page break": "Page break",
   "Insert a page break for printing.": "Insert a page break for printing.",
+  "Footnote": "Footnote",
+  "Insert a footnote reference.": "Insert a footnote reference.",
   "Upload any image from your device.": "Upload any image from your device.",
   "Upload any video from your device.": "Upload any video from your device.",
   "Upload any audio from your device.": "Upload any audio from your device.",
@@ -1153,5 +1155,152 @@
   "Create property": "Create property",
   "Hide properties": "Hide properties",
   "Find a property type": "Find a property type",
-  "Properties": "Properties"
+  "Properties": "Properties",
+  "A property with this name already exists": "A property with this name already exists",
+  "Add card": "Add card",
+  "Add filter": "Add filter",
+  "Add option": "Add option",
+  "Add sort": "Add sort",
+  "Add view": "Add view",
+  "All data in this column will be lost.": "All data in this column will be lost.",
+  "Allow multiple people": "Allow multiple people",
+  "Alphabetize": "Alphabetize",
+  "Are you sure you want to delete": "Are you sure you want to delete",
+  "Ascending": "Ascending",
+  "Base deleted": "Base deleted",
+  "Base name": "Base name",
+  "Base table": "Base table",
+  "Card properties": "Card properties",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Cells longer than the Text limit will be truncated and the extra content permanently lost.",
+  "Checkbox": "Checkbox",
+  "Checked by default": "Checked by default",
+  "Choose a property": "Choose a property",
+  "Clear selection": "Clear selection",
+  "Column options": "Column options",
+  "Comma, period": "Comma, period",
+  "Complete": "Complete",
+  "Contains": "Contains",
+  "Copy link to view": "Copy link to view",
+  "Create a status property": "Create a status property",
+  "Created at": "Created at",
+  "Currency": "Currency",
+  "Decimal places": "Decimal places",
+  "Default value": "Default value",
+  "Delete property": "Delete property",
+  "Delete view": "Delete view",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Descending",
+  "Discard": "Discard",
+  "Doesn't contain": "Doesn't contain",
+  "Done": "Done",
+  "Edit formula": "Edit formula",
+  "Edit property": "Edit property",
+  "Export CSV": "Export CSV",
+  "Failed to load base": "Failed to load base",
+  "False": "False",
+  "File": "File",
+  "Filter and sort changes are visible only to you": "Filter and sort changes are visible only to you",
+  "Filter by": "Filter by",
+  "Formula": "Formula",
+  "Get started with": "Get started with",
+  "Greater than": "Greater than",
+  "Group by": "Group by",
+  "Group this board by a select or status property.": "Group this board by a select or status property.",
+  "Hide all": "Hide all",
+  "Hide group": "Hide group",
+  "In Progress": "In Progress",
+  "In progress": "In progress",
+  "Include time": "Include time",
+  "Insert a kanban board on this page": "Insert a kanban board on this page",
+  "Insert an inline base on this page": "Insert an inline base on this page",
+  "Is": "Is",
+  "Is after": "Is after",
+  "Is any of": "Is any of",
+  "Is before": "Is before",
+  "Is empty": "Is empty",
+  "Is none of": "Is none of",
+  "Is not": "Is not",
+  "Is not empty": "Is not empty",
+  "Is on or after": "Is on or after",
+  "Is on or before": "Is on or before",
+  "Is within": "Is within",
+  "Keep editing": "Keep editing",
+  "Last edited at": "Last edited at",
+  "Last edited by": "Last edited by",
+  "Less than": "Less than",
+  "Link copied to clipboard": "Link copied to clipboard",
+  "Local": "Local",
+  "Long text": "Long text",
+  "Moved card to {{column}}": "Moved card to {{column}}",
+  "Moved column to {{column}}": "Moved column to {{column}}",
+  "Multi-select": "Multi-select",
+  "New row": "New row",
+  "Next month": "Next month",
+  "Next week": "Next week",
+  "Next year": "Next year",
+  "No filters applied": "No filters applied",
+  "No match": "No match",
+  "No options for this property type": "No options for this property type",
+  "No sorts applied": "No sorts applied",
+  "No value": "No value",
+  "None": "None",
+  "Not started": "Not started",
+  "Number": "Number",
+  "One month ago": "One month ago",
+  "One month from now": "One month from now",
+  "One week ago": "One week ago",
+  "One week from now": "One week from now",
+  "Open as page": "Open as page",
+  "Options": "Options",
+  "Past month": "Past month",
+  "Past week": "Past week",
+  "Past year": "Past year",
+  "Percent": "Percent",
+  "Period, comma": "Period, comma",
+  "Person": "Person",
+  "Please enter a valid email": "Please enter a valid email",
+  "Progress": "Progress",
+  "Property options": "Property options",
+  "Relative": "Relative",
+  "Rename property": "Rename property",
+  "Reset": "Reset",
+  "Save for everyone": "Save for everyone",
+  "Select": "Select",
+  "Select a property": "Select a property",
+  "Select all loaded rows": "Select all loaded rows",
+  "Show all": "Show all",
+  "Sort": "Sort",
+  "Sort by": "Sort by",
+  "Space, comma": "Space, comma",
+  "Space, period": "Space, period",
+  "This board has no grouping property yet.": "This board has no grouping property yet.",
+  "This month": "This month",
+  "This year": "This year",
+  "Thousands and decimal separators": "Thousands and decimal separators",
+  "Time format": "Time format",
+  "To Do": "To Do",
+  "Tomorrow": "Tomorrow",
+  "True": "True",
+  "Unsaved changes": "Unsaved changes",
+  "Untitled base": "Untitled base",
+  "URL": "URL",
+  "Value": "Value",
+  "View updated for everyone": "View updated for everyone",
+  "You have unsaved changes. Do you want to discard them?": "You have unsaved changes. Do you want to discard them?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Compare",
+  "Compare versions": "Compare versions",
+  "Select version from {{date}}": "Select version from {{date}}",
+  "Version actions for {{date}}": "Version actions for {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparing {{newer}} and {{older}}",
+  "Exit compare": "Exit compare",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }

apps/client/public/locales/es-ES/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Crear propiedad",
   "Hide properties": "Ocultar propiedades",
   "Find a property type": "Buscar un tipo de propiedad",
-  "Properties": "Propiedades"
+  "Properties": "Propiedades",
+  "A property with this name already exists": "Ya existe una propiedad con este nombre",
+  "Add card": "Agregar tarjeta",
+  "Add filter": "Agregar filtro",
+  "Add option": "Agregar opción",
+  "Add sort": "Agregar orden",
+  "Add view": "Agregar vista",
+  "All data in this column will be lost.": "Todos los datos de esta columna se perderán.",
+  "Allow multiple people": "Permitir varias personas",
+  "Alphabetize": "Ordenar alfabéticamente",
+  "Are you sure you want to delete": "¿Está seguro de que desea eliminar",
+  "Ascending": "Ascendente",
+  "Base deleted": "Base eliminada",
+  "Base name": "Nombre de la base",
+  "Base table": "Tabla base",
+  "Card properties": "Propiedades de la tarjeta",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Las celdas más largas que el límite de texto se truncarán y el contenido adicional se perderá permanentemente.",
+  "Checkbox": "Casilla de verificación",
+  "Checked by default": "Marcado por defecto",
+  "Choose a property": "Seleccione una propiedad",
+  "Clear selection": "Borrar selección",
+  "Column options": "Opciones de columna",
+  "Comma, period": "Coma, punto",
+  "Complete": "Completo",
+  "Contains": "Contiene",
+  "Copy link to view": "Copiar enlace a la vista",
+  "Create a status property": "Crear una propiedad de estado",
+  "Created at": "Creado el",
+  "Currency": "Moneda",
+  "Decimal places": "Decimales",
+  "Default value": "Valor predeterminado",
+  "Delete property": "Eliminar propiedad",
+  "Delete view": "Eliminar vista",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Descendente",
+  "Discard": "Descartar",
+  "Doesn't contain": "No contiene",
+  "Done": "Hecho",
+  "Edit formula": "Editar fórmula",
+  "Edit property": "Editar propiedad",
+  "Export CSV": "Exportar CSV",
+  "Failed to load base": "No se pudo cargar la base",
+  "False": "Falso",
+  "File": "Archivo",
+  "Filter and sort changes are visible only to you": "Los cambios de filtro y ordenación solo son visibles para usted",
+  "Filter by": "Filtrar por",
+  "Formula": "Fórmula",
+  "Get started with": "Comenzar con",
+  "Greater than": "Mayor que",
+  "Group by": "Agrupar por",
+  "Group this board by a select or status property.": "Agrupe este tablero por una propiedad de selección o estado.",
+  "Hide all": "Ocultar todo",
+  "Hide group": "Ocultar grupo",
+  "In Progress": "En curso",
+  "In progress": "En curso",
+  "Include time": "Incluir hora",
+  "Insert a kanban board on this page": "Insertar un tablero kanban en esta página",
+  "Insert an inline base on this page": "Insertar una base integrada en esta página",
+  "Is": "Es",
+  "Is after": "Es posterior a",
+  "Is any of": "Es cualquiera de",
+  "Is before": "Es anterior a",
+  "Is empty": "Está vacío",
+  "Is none of": "No es ninguno de",
+  "Is not": "No es",
+  "Is not empty": "No está vacío",
+  "Is on or after": "Es en o después de",
+  "Is on or before": "Es en o antes de",
+  "Is within": "Está dentro de",
+  "Keep editing": "Seguir editando",
+  "Last edited at": "Última edición el",
+  "Last edited by": "Última edición por",
+  "Less than": "Menor que",
+  "Link copied to clipboard": "Enlace copiado al portapapeles",
+  "Local": "Local",
+  "Long text": "Texto largo",
+  "Moved card to {{column}}": "Tarjeta movida a {{column}}",
+  "Moved column to {{column}}": "Columna movida a {{column}}",
+  "Multi-select": "Selección múltiple",
+  "New row": "Nueva fila",
+  "Next month": "Próximo mes",
+  "Next week": "Próxima semana",
+  "Next year": "Próximo año",
+  "No filters applied": "No hay filtros aplicados",
+  "No match": "Sin coincidencias",
+  "No options for this property type": "No hay opciones para este tipo de propiedad",
+  "No sorts applied": "No hay ordenaciones aplicadas",
+  "No value": "Sin valor",
+  "None": "Ninguno",
+  "Not started": "No iniciado",
+  "Number": "Número",
+  "One month ago": "Hace un mes",
+  "One month from now": "Dentro de un mes",
+  "One week ago": "Hace una semana",
+  "One week from now": "Dentro de una semana",
+  "Open as page": "Abrir como página",
+  "Options": "Opciones",
+  "Past month": "Último mes",
+  "Past week": "Última semana",
+  "Past year": "Último año",
+  "Percent": "Porcentaje",
+  "Period, comma": "Punto, coma",
+  "Person": "Persona",
+  "Please enter a valid email": "Por favor, introduzca un correo electrónico válido",
+  "Progress": "Progreso",
+  "Property options": "Opciones de propiedad",
+  "Relative": "Relativo",
+  "Rename property": "Renombrar propiedad",
+  "Reset": "Restablecer",
+  "Save for everyone": "Guardar para todos",
+  "Select": "Selección",
+  "Select a property": "Seleccionar una propiedad",
+  "Select all loaded rows": "Seleccionar todas las filas cargadas",
+  "Show all": "Mostrar todo",
+  "Sort": "Ordenar",
+  "Sort by": "Ordenar por",
+  "Space, comma": "Espacio, coma",
+  "Space, period": "Espacio, punto",
+  "This board has no grouping property yet.": "Este tablero aún no tiene una propiedad de agrupación.",
+  "This month": "Este mes",
+  "This year": "Este año",
+  "Thousands and decimal separators": "Separadores de miles y decimales",
+  "Time format": "Formato de hora",
+  "To Do": "Por hacer",
+  "Tomorrow": "Mañana",
+  "True": "Verdadero",
+  "Unsaved changes": "Cambios no guardados",
+  "Untitled base": "Base sin título",
+  "URL": "URL",
+  "Value": "Valor",
+  "View updated for everyone": "Vista actualizada para todos",
+  "You have unsaved changes. Do you want to discard them?": "Tiene cambios no guardados. ¿Quiere descartarlos?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/fr-FR/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Créer une propriété",
   "Hide properties": "Masquer les propriétés",
   "Find a property type": "Rechercher un type de propriété",
-  "Properties": "Propriétés"
+  "Properties": "Propriétés",
+  "A property with this name already exists": "Une propriété portant ce nom existe déjà",
+  "Add card": "Ajouter une carte",
+  "Add filter": "Ajouter un filtre",
+  "Add option": "Ajouter une option",
+  "Add sort": "Ajouter un tri",
+  "Add view": "Ajouter une vue",
+  "All data in this column will be lost.": "Toutes les données de cette colonne seront perdues.",
+  "Allow multiple people": "Autoriser plusieurs personnes",
+  "Alphabetize": "Trier par ordre alphabétique",
+  "Are you sure you want to delete": "Êtes-vous sûr de vouloir supprimer",
+  "Ascending": "Croissant",
+  "Base deleted": "Base supprimée",
+  "Base name": "Nom de la base",
+  "Base table": "Table de base",
+  "Card properties": "Propriétés de la carte",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Les cellules dépassant la limite de texte seront tronquées et le contenu supplémentaire sera définitivement perdu.",
+  "Checkbox": "Case à cocher",
+  "Checked by default": "Coché par défaut",
+  "Choose a property": "Choisir une propriété",
+  "Clear selection": "Effacer la sélection",
+  "Column options": "Options de la colonne",
+  "Comma, period": "Virgule, point",
+  "Complete": "Terminé",
+  "Contains": "Contient",
+  "Copy link to view": "Copier le lien vers la vue",
+  "Create a status property": "Créer une propriété de statut",
+  "Created at": "Créé le",
+  "Currency": "Devise",
+  "Decimal places": "Décimales",
+  "Default value": "Valeur par défaut",
+  "Delete property": "Supprimer la propriété",
+  "Delete view": "Supprimer la vue",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Décroissant",
+  "Discard": "Ignorer",
+  "Doesn't contain": "Ne contient pas",
+  "Done": "Terminé",
+  "Edit formula": "Modifier la formule",
+  "Edit property": "Modifier la propriété",
+  "Export CSV": "Exporter en CSV",
+  "Failed to load base": "Échec du chargement de la base",
+  "False": "Faux",
+  "File": "Fichier",
+  "Filter and sort changes are visible only to you": "Les modifications de filtre et de tri ne sont visibles que par vous",
+  "Filter by": "Filtrer par",
+  "Formula": "Formule",
+  "Get started with": "Commencer avec",
+  "Greater than": "Supérieur à",
+  "Group by": "Grouper par",
+  "Group this board by a select or status property.": "Groupez ce tableau par une propriété de sélection ou de statut.",
+  "Hide all": "Tout masquer",
+  "Hide group": "Masquer le groupe",
+  "In Progress": "En cours",
+  "In progress": "En cours",
+  "Include time": "Inclure l'heure",
+  "Insert a kanban board on this page": "Insérer un tableau kanban sur cette page",
+  "Insert an inline base on this page": "Insérer une base intégrée sur cette page",
+  "Is": "Est",
+  "Is after": "Est après",
+  "Is any of": "Est l'un de",
+  "Is before": "Est avant",
+  "Is empty": "Est vide",
+  "Is none of": "N'est aucun de",
+  "Is not": "N'est pas",
+  "Is not empty": "N'est pas vide",
+  "Is on or after": "Est le ou après le",
+  "Is on or before": "Est le ou avant le",
+  "Is within": "Est dans la plage",
+  "Keep editing": "Continuer la modification",
+  "Last edited at": "Dernière modification le",
+  "Last edited by": "Dernière modification par",
+  "Less than": "Inférieur à",
+  "Link copied to clipboard": "Lien copié dans le presse-papiers",
+  "Local": "Local",
+  "Long text": "Texte long",
+  "Moved card to {{column}}": "Carte déplacée vers {{column}}",
+  "Moved column to {{column}}": "Colonne déplacée vers {{column}}",
+  "Multi-select": "Sélection multiple",
+  "New row": "Nouvelle ligne",
+  "Next month": "Le mois prochain",
+  "Next week": "La semaine prochaine",
+  "Next year": "L'année prochaine",
+  "No filters applied": "Aucun filtre appliqué",
+  "No match": "Aucune correspondance",
+  "No options for this property type": "Aucune option pour ce type de propriété",
+  "No sorts applied": "Aucun tri appliqué",
+  "No value": "Aucune valeur",
+  "None": "Aucun",
+  "Not started": "Non commencé",
+  "Number": "Nombre",
+  "One month ago": "Il y a un mois",
+  "One month from now": "Dans un mois",
+  "One week ago": "Il y a une semaine",
+  "One week from now": "Dans une semaine",
+  "Open as page": "Ouvrir comme page",
+  "Options": "Options",
+  "Past month": "Le mois dernier",
+  "Past week": "La semaine dernière",
+  "Past year": "L'année dernière",
+  "Percent": "Pourcentage",
+  "Period, comma": "Point, virgule",
+  "Person": "Personne",
+  "Please enter a valid email": "Veuillez entrer une adresse e-mail valide",
+  "Progress": "Progression",
+  "Property options": "Options de la propriété",
+  "Relative": "Relatif",
+  "Rename property": "Renommer la propriété",
+  "Reset": "Réinitialiser",
+  "Save for everyone": "Enregistrer pour tout le monde",
+  "Select": "Sélection",
+  "Select a property": "Sélectionner une propriété",
+  "Select all loaded rows": "Sélectionner toutes les lignes chargées",
+  "Show all": "Tout afficher",
+  "Sort": "Trier",
+  "Sort by": "Trier par",
+  "Space, comma": "Espace, virgule",
+  "Space, period": "Espace, point",
+  "This board has no grouping property yet.": "Ce tableau n'a pas encore de propriété de groupement.",
+  "This month": "Ce mois-ci",
+  "This year": "Cette année",
+  "Thousands and decimal separators": "Séparateurs des milliers et des décimales",
+  "Time format": "Format de l'heure",
+  "To Do": "À faire",
+  "Tomorrow": "Demain",
+  "True": "Vrai",
+  "Unsaved changes": "Modifications non enregistrées",
+  "Untitled base": "Base sans titre",
+  "URL": "URL",
+  "Value": "Valeur",
+  "View updated for everyone": "Vue mise à jour pour tout le monde",
+  "You have unsaved changes. Do you want to discard them?": "Vous avez des modifications non enregistrées. Voulez-vous les ignorer ?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/it-IT/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Crea proprietà",
   "Hide properties": "Nascondi proprietà",
   "Find a property type": "Trova un tipo di proprietà",
-  "Properties": "Proprietà"
+  "Properties": "Proprietà",
+  "A property with this name already exists": "Esiste già una proprietà con questo nome",
+  "Add card": "Aggiungi scheda",
+  "Add filter": "Aggiungi filtro",
+  "Add option": "Aggiungi opzione",
+  "Add sort": "Aggiungi ordinamento",
+  "Add view": "Aggiungi vista",
+  "All data in this column will be lost.": "Tutti i dati in questa colonna andranno persi.",
+  "Allow multiple people": "Consenti più persone",
+  "Alphabetize": "Ordina alfabeticamente",
+  "Are you sure you want to delete": "Sei sicuro di voler eliminare",
+  "Ascending": "Crescente",
+  "Base deleted": "Base eliminata",
+  "Base name": "Nome della base",
+  "Base table": "Tabella della base",
+  "Card properties": "Proprietà della scheda",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Le celle più lunghe del limite del testo verranno troncate e il contenuto aggiuntivo andrà perso in modo permanente.",
+  "Checkbox": "Casella di controllo",
+  "Checked by default": "Selezionata per impostazione predefinita",
+  "Choose a property": "Scegli una proprietà",
+  "Clear selection": "Cancella selezione",
+  "Column options": "Opzioni della colonna",
+  "Comma, period": "Virgola, punto",
+  "Complete": "Completato",
+  "Contains": "Contiene",
+  "Copy link to view": "Copia link alla vista",
+  "Create a status property": "Crea una proprietà di stato",
+  "Created at": "Creato il",
+  "Currency": "Valuta",
+  "Decimal places": "Posizioni decimali",
+  "Default value": "Valore predefinito",
+  "Delete property": "Elimina proprietà",
+  "Delete view": "Elimina vista",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Decrescente",
+  "Discard": "Ignora",
+  "Doesn't contain": "Non contiene",
+  "Done": "Fatto",
+  "Edit formula": "Modifica formula",
+  "Edit property": "Modifica proprietà",
+  "Export CSV": "Esporta CSV",
+  "Failed to load base": "Impossibile caricare la base",
+  "False": "Falso",
+  "File": "File",
+  "Filter and sort changes are visible only to you": "Le modifiche a filtri e ordinamenti sono visibili solo a te",
+  "Filter by": "Filtra per",
+  "Formula": "Formula",
+  "Get started with": "Inizia con",
+  "Greater than": "Maggiore di",
+  "Group by": "Raggruppa per",
+  "Group this board by a select or status property.": "Raggruppa questa bacheca per una proprietà di selezione o di stato.",
+  "Hide all": "Nascondi tutto",
+  "Hide group": "Nascondi gruppo",
+  "In Progress": "In corso",
+  "In progress": "In corso",
+  "Include time": "Includi ora",
+  "Insert a kanban board on this page": "Inserisci una bacheca kanban in questa pagina",
+  "Insert an inline base on this page": "Inserisci una base in linea in questa pagina",
+  "Is": "È",
+  "Is after": "È dopo",
+  "Is any of": "È uno tra",
+  "Is before": "È prima",
+  "Is empty": "È vuoto",
+  "Is none of": "Non è nessuno di",
+  "Is not": "Non è",
+  "Is not empty": "Non è vuoto",
+  "Is on or after": "È il o dopo il",
+  "Is on or before": "È il o prima del",
+  "Is within": "È entro",
+  "Keep editing": "Continua a modificare",
+  "Last edited at": "Ultima modifica il",
+  "Last edited by": "Ultima modifica di",
+  "Less than": "Minore di",
+  "Link copied to clipboard": "Link copiato negli appunti",
+  "Local": "Locale",
+  "Long text": "Testo lungo",
+  "Moved card to {{column}}": "Scheda spostata in {{column}}",
+  "Moved column to {{column}}": "Colonna spostata in {{column}}",
+  "Multi-select": "Selezione multipla",
+  "New row": "Nuova riga",
+  "Next month": "Prossimo mese",
+  "Next week": "Prossima settimana",
+  "Next year": "Prossimo anno",
+  "No filters applied": "Nessun filtro applicato",
+  "No match": "Nessuna corrispondenza",
+  "No options for this property type": "Nessuna opzione per questo tipo di proprietà",
+  "No sorts applied": "Nessun ordinamento applicato",
+  "No value": "Nessun valore",
+  "None": "Nessuno",
+  "Not started": "Non iniziato",
+  "Number": "Numero",
+  "One month ago": "Un mese fa",
+  "One month from now": "Tra un mese",
+  "One week ago": "Una settimana fa",
+  "One week from now": "Tra una settimana",
+  "Open as page": "Apri come pagina",
+  "Options": "Opzioni",
+  "Past month": "Mese scorso",
+  "Past week": "Settimana scorsa",
+  "Past year": "Anno scorso",
+  "Percent": "Percentuale",
+  "Period, comma": "Punto, virgola",
+  "Person": "Persona",
+  "Please enter a valid email": "Inserisci un indirizzo email valido",
+  "Progress": "Avanzamento",
+  "Property options": "Opzioni della proprietà",
+  "Relative": "Relativo",
+  "Rename property": "Rinomina proprietà",
+  "Reset": "Reimposta",
+  "Save for everyone": "Salva per tutti",
+  "Select": "Seleziona",
+  "Select a property": "Seleziona una proprietà",
+  "Select all loaded rows": "Seleziona tutte le righe caricate",
+  "Show all": "Mostra tutto",
+  "Sort": "Ordina",
+  "Sort by": "Ordina per",
+  "Space, comma": "Spazio, virgola",
+  "Space, period": "Spazio, punto",
+  "This board has no grouping property yet.": "Questa bacheca non ha ancora una proprietà di raggruppamento.",
+  "This month": "Questo mese",
+  "This year": "Quest'anno",
+  "Thousands and decimal separators": "Separatori delle migliaia e dei decimali",
+  "Time format": "Formato ora",
+  "To Do": "Da fare",
+  "Tomorrow": "Domani",
+  "True": "Vero",
+  "Unsaved changes": "Modifiche non salvate",
+  "Untitled base": "Base senza titolo",
+  "URL": "URL",
+  "Value": "Valore",
+  "View updated for everyone": "Vista aggiornata per tutti",
+  "You have unsaved changes. Do you want to discard them?": "Hai modifiche non salvate. Vuoi ignorarle?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/ja-JP/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "プロパティを作成",
   "Hide properties": "プロパティを非表示",
   "Find a property type": "プロパティの種類を検索",
-  "Properties": "プロパティ"
+  "Properties": "プロパティ",
+  "A property with this name already exists": "この名前のプロパティはすでに存在します",
+  "Add card": "カードを追加",
+  "Add filter": "フィルターを追加",
+  "Add option": "オプションを追加",
+  "Add sort": "並べ替えを追加",
+  "Add view": "ビューを追加",
+  "All data in this column will be lost.": "この列内のすべてのデータは失われます。",
+  "Allow multiple people": "複数のユーザーを許可",
+  "Alphabetize": "アルファベット順",
+  "Are you sure you want to delete": "削除してもよろしいですか",
+  "Ascending": "昇順",
+  "Base deleted": "ベースを削除しました",
+  "Base name": "ベース名",
+  "Base table": "ベーステーブル",
+  "Card properties": "カードのプロパティ",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "テキストの制限を超える長さのセルは切り詰められ、超過分の内容は完全に失われます。",
+  "Checkbox": "チェックボックス",
+  "Checked by default": "デフォルトでチェックを入れる",
+  "Choose a property": "プロパティを選択",
+  "Clear selection": "選択をクリア",
+  "Column options": "列のオプション",
+  "Comma, period": "カンマ、小数点",
+  "Complete": "完了",
+  "Contains": "含む",
+  "Copy link to view": "ビューへのリンクをコピー",
+  "Create a status property": "ステータスプロパティを作成",
+  "Created at": "作成日時",
+  "Currency": "通貨",
+  "Decimal places": "小数点以下の桁数",
+  "Default value": "デフォルト値",
+  "Delete property": "プロパティを削除",
+  "Delete view": "ビューを削除",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "降順",
+  "Discard": "破棄",
+  "Doesn't contain": "含まない",
+  "Done": "完了",
+  "Edit formula": "数式を編集",
+  "Edit property": "プロパティを編集",
+  "Export CSV": "CSVをエクスポート",
+  "Failed to load base": "ベースの読み込みに失敗しました",
+  "False": "偽",
+  "File": "ファイル",
+  "Filter and sort changes are visible only to you": "フィルターと並べ替えの変更は自分にのみ表示されます",
+  "Filter by": "条件",
+  "Formula": "数式",
+  "Get started with": "次から始める",
+  "Greater than": "より大きい",
+  "Group by": "グループ化",
+  "Group this board by a select or status property.": "このボードをセレクトまたはステータスのプロパティでグループ化します。",
+  "Hide all": "すべて非表示",
+  "Hide group": "グループを非表示",
+  "In Progress": "進行中",
+  "In progress": "進行中",
+  "Include time": "時刻を含める",
+  "Insert a kanban board on this page": "このページにカンバンボードを挿入",
+  "Insert an inline base on this page": "このページにインラインベースを挿入",
+  "Is": "次に等しい",
+  "Is after": "次より後",
+  "Is any of": "次のいずれか",
+  "Is before": "次より前",
+  "Is empty": "空である",
+  "Is none of": "次のいずれでもない",
+  "Is not": "次に等しくない",
+  "Is not empty": "空ではない",
+  "Is on or after": "次以降",
+  "Is on or before": "次以前",
+  "Is within": "次の期間内",
+  "Keep editing": "編集を続ける",
+  "Last edited at": "最終編集日時",
+  "Last edited by": "最終編集者",
+  "Less than": "より小さい",
+  "Link copied to clipboard": "リンクをクリップボードにコピーしました",
+  "Local": "ローカル",
+  "Long text": "長いテキスト",
+  "Moved card to {{column}}": "カードを{{column}}に移動しました",
+  "Moved column to {{column}}": "列を{{column}}に移動しました",
+  "Multi-select": "複数選択",
+  "New row": "新規行",
+  "Next month": "来月",
+  "Next week": "来週",
+  "Next year": "来年",
+  "No filters applied": "フィルターは適用されていません",
+  "No match": "一致なし",
+  "No options for this property type": "このプロパティタイプにはオプションがありません",
+  "No sorts applied": "並べ替えは適用されていません",
+  "No value": "値なし",
+  "None": "なし",
+  "Not started": "未着手",
+  "Number": "数値",
+  "One month ago": "1か月前",
+  "One month from now": "1か月後",
+  "One week ago": "1週間前",
+  "One week from now": "1週間後",
+  "Open as page": "ページとして開く",
+  "Options": "オプション",
+  "Past month": "先月",
+  "Past week": "先週",
+  "Past year": "昨年",
+  "Percent": "パーセント",
+  "Period, comma": "小数点、カンマ",
+  "Person": "ユーザー",
+  "Please enter a valid email": "有効なメールアドレスを入力してください",
+  "Progress": "進捗",
+  "Property options": "プロパティのオプション",
+  "Relative": "相対",
+  "Rename property": "プロパティ名を変更",
+  "Reset": "リセット",
+  "Save for everyone": "全員に保存",
+  "Select": "選択",
+  "Select a property": "プロパティを選択",
+  "Select all loaded rows": "読み込まれているすべての行を選択",
+  "Show all": "すべて表示",
+  "Sort": "並べ替え",
+  "Sort by": "並べ替え条件",
+  "Space, comma": "スペース、カンマ",
+  "Space, period": "スペース、小数点",
+  "This board has no grouping property yet.": "このボードにはまだグループ化プロパティがありません。",
+  "This month": "今月",
+  "This year": "今年",
+  "Thousands and decimal separators": "桁区切りと小数点区切り",
+  "Time format": "時刻形式",
+  "To Do": "To Do",
+  "Tomorrow": "明日",
+  "True": "真",
+  "Unsaved changes": "未保存の変更",
+  "Untitled base": "無題のベース",
+  "URL": "URL",
+  "Value": "値",
+  "View updated for everyone": "ビューが全員向けに更新されました",
+  "You have unsaved changes. Do you want to discard them?": "未保存の変更があります。破棄しますか？",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/ko-KR/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "속성 만들기",
   "Hide properties": "속성 숨기기",
   "Find a property type": "속성 유형 찾기",
-  "Properties": "속성"
+  "Properties": "속성",
+  "A property with this name already exists": "이 이름의 속성이 이미 있습니다",
+  "Add card": "카드 추가",
+  "Add filter": "필터 추가",
+  "Add option": "옵션 추가",
+  "Add sort": "정렬 추가",
+  "Add view": "보기 추가",
+  "All data in this column will be lost.": "이 열의 모든 데이터가 손실됩니다.",
+  "Allow multiple people": "여러 사람 허용",
+  "Alphabetize": "가나다순",
+  "Are you sure you want to delete": "삭제하시겠습니까",
+  "Ascending": "오름차순",
+  "Base deleted": "베이스가 삭제됨",
+  "Base name": "베이스 이름",
+  "Base table": "베이스 테이블",
+  "Card properties": "카드 속성",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "텍스트 제한보다 긴 셀은 잘리며, 초과된 콘텐츠는 영구적으로 손실됩니다.",
+  "Checkbox": "체크박스",
+  "Checked by default": "기본적으로 선택됨",
+  "Choose a property": "속성 선택",
+  "Clear selection": "선택 지우기",
+  "Column options": "열 옵션",
+  "Comma, period": "쉼표, 마침표",
+  "Complete": "완료",
+  "Contains": "포함",
+  "Copy link to view": "보기 링크 복사",
+  "Create a status property": "상태 속성 만들기",
+  "Created at": "작성 시간",
+  "Currency": "통화",
+  "Decimal places": "소수 자릿수",
+  "Default value": "기본값",
+  "Delete property": "속성 삭제",
+  "Delete view": "보기 삭제",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "내림차순",
+  "Discard": "삭제",
+  "Doesn't contain": "포함하지 않음",
+  "Done": "완료",
+  "Edit formula": "수식 편집",
+  "Edit property": "속성 편집",
+  "Export CSV": "CSV 내보내기",
+  "Failed to load base": "베이스를 불러오지 못했습니다",
+  "False": "거짓",
+  "File": "파일",
+  "Filter and sort changes are visible only to you": "필터 및 정렬 변경 사항은 나에게만 표시됩니다",
+  "Filter by": "필터 기준",
+  "Formula": "수식",
+  "Get started with": "시작하기",
+  "Greater than": "보다 큼",
+  "Group by": "그룹화 기준",
+  "Group this board by a select or status property.": "선택 또는 상태 속성으로 이 보드를 그룹화하세요.",
+  "Hide all": "모두 숨기기",
+  "Hide group": "그룹 숨기기",
+  "In Progress": "진행 중",
+  "In progress": "진행 중",
+  "Include time": "시간 포함",
+  "Insert a kanban board on this page": "이 페이지에 칸반 보드 삽입",
+  "Insert an inline base on this page": "이 페이지에 인라인 베이스 삽입",
+  "Is": "같음",
+  "Is after": "이후",
+  "Is any of": "다음 중 하나와 같음",
+  "Is before": "이전",
+  "Is empty": "비어 있음",
+  "Is none of": "다음 중 어느 것과도 같지 않음",
+  "Is not": "같지 않음",
+  "Is not empty": "비어 있지 않음",
+  "Is on or after": "해당 날짜 또는 이후",
+  "Is on or before": "해당 날짜 또는 이전",
+  "Is within": "다음 범위 내",
+  "Keep editing": "계속 편집",
+  "Last edited at": "마지막 편집 시간",
+  "Last edited by": "마지막 편집자",
+  "Less than": "보다 작음",
+  "Link copied to clipboard": "링크가 클립보드에 복사됨",
+  "Local": "로컬",
+  "Long text": "긴 텍스트",
+  "Moved card to {{column}}": "카드를 {{column}}(으)로 이동함",
+  "Moved column to {{column}}": "열을 {{column}}(으)로 이동함",
+  "Multi-select": "다중 선택",
+  "New row": "새 행",
+  "Next month": "다음 달",
+  "Next week": "다음 주",
+  "Next year": "내년",
+  "No filters applied": "적용된 필터 없음",
+  "No match": "일치하는 항목 없음",
+  "No options for this property type": "이 속성 유형에는 옵션이 없습니다",
+  "No sorts applied": "적용된 정렬 없음",
+  "No value": "값 없음",
+  "None": "없음",
+  "Not started": "시작 전",
+  "Number": "숫자",
+  "One month ago": "한 달 전",
+  "One month from now": "한 달 후",
+  "One week ago": "일주일 전",
+  "One week from now": "일주일 후",
+  "Open as page": "페이지로 열기",
+  "Options": "옵션",
+  "Past month": "지난달",
+  "Past week": "지난주",
+  "Past year": "작년",
+  "Percent": "백분율",
+  "Period, comma": "마침표, 쉼표",
+  "Person": "사람",
+  "Please enter a valid email": "유효한 이메일을 입력하세요",
+  "Progress": "진행률",
+  "Property options": "속성 옵션",
+  "Relative": "상대값",
+  "Rename property": "속성 이름 변경",
+  "Reset": "재설정",
+  "Save for everyone": "모든 사용자에게 저장",
+  "Select": "선택",
+  "Select a property": "속성 선택",
+  "Select all loaded rows": "불러온 모든 행 선택",
+  "Show all": "모두 보기",
+  "Sort": "정렬",
+  "Sort by": "정렬 기준",
+  "Space, comma": "공백, 쉼표",
+  "Space, period": "공백, 마침표",
+  "This board has no grouping property yet.": "이 보드에는 아직 그룹화 속성이 없습니다.",
+  "This month": "이번 달",
+  "This year": "올해",
+  "Thousands and decimal separators": "천 단위 및 소수 구분 기호",
+  "Time format": "시간 형식",
+  "To Do": "할 일",
+  "Tomorrow": "내일",
+  "True": "참",
+  "Unsaved changes": "저장되지 않은 변경 사항",
+  "Untitled base": "제목 없는 베이스",
+  "URL": "URL",
+  "Value": "값",
+  "View updated for everyone": "보기가 모두에게 업데이트되었습니다",
+  "You have unsaved changes. Do you want to discard them?": "저장되지 않은 변경 사항이 있습니다. 버리시겠습니까?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/nl-NL/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Eigenschap aanmaken",
   "Hide properties": "Eigenschappen verbergen",
   "Find a property type": "Een eigenschapstype zoeken",
-  "Properties": "Eigenschappen"
+  "Properties": "Eigenschappen",
+  "A property with this name already exists": "Er bestaat al een eigenschap met deze naam",
+  "Add card": "Kaart toevoegen",
+  "Add filter": "Filter toevoegen",
+  "Add option": "Optie toevoegen",
+  "Add sort": "Sortering toevoegen",
+  "Add view": "Weergave toevoegen",
+  "All data in this column will be lost.": "Alle gegevens in deze kolom gaan verloren.",
+  "Allow multiple people": "Meerdere personen toestaan",
+  "Alphabetize": "Alfabetisch sorteren",
+  "Are you sure you want to delete": "Weet je zeker dat je wilt verwijderen",
+  "Ascending": "Oplopend",
+  "Base deleted": "Base verwijderd",
+  "Base name": "Basenaam",
+  "Base table": "Basistabel",
+  "Card properties": "Kaarteigenschappen",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Cellen die langer zijn dan de tekstlimiet worden afgekapt en de extra inhoud gaat permanent verloren.",
+  "Checkbox": "Selectievakje",
+  "Checked by default": "Standaard aangevinkt",
+  "Choose a property": "Kies een eigenschap",
+  "Clear selection": "Selectie wissen",
+  "Column options": "Kolomopties",
+  "Comma, period": "Komma, punt",
+  "Complete": "Voltooid",
+  "Contains": "Bevat",
+  "Copy link to view": "Link naar weergave kopiëren",
+  "Create a status property": "Een statuseigenschap maken",
+  "Created at": "Aangemaakt op",
+  "Currency": "Valuta",
+  "Decimal places": "Decimalen",
+  "Default value": "Standaardwaarde",
+  "Delete property": "Eigenschap verwijderen",
+  "Delete view": "Weergave verwijderen",
+  "Delete {{count}} rows?_one": "1 rij verwijderen?",
+  "Delete {{count}} rows?_other": "{{count}} rijen verwijderen?",
+  "Descending": "Aflopend",
+  "Discard": "Negeren",
+  "Doesn't contain": "Bevat niet",
+  "Done": "Klaar",
+  "Edit formula": "Formule bewerken",
+  "Edit property": "Eigenschap bewerken",
+  "Export CSV": "CSV exporteren",
+  "Failed to load base": "Base laden mislukt",
+  "False": "Onwaar",
+  "File": "Bestand",
+  "Filter and sort changes are visible only to you": "Wijzigingen in filters en sortering zijn alleen zichtbaar voor jou",
+  "Filter by": "Filteren op",
+  "Formula": "Formule",
+  "Get started with": "Aan de slag met",
+  "Greater than": "Groter dan",
+  "Group by": "Groeperen op",
+  "Group this board by a select or status property.": "Groepeer dit bord op een selectie- of statuseigenschap.",
+  "Hide all": "Alles verbergen",
+  "Hide group": "Groep verbergen",
+  "In Progress": "In uitvoering",
+  "In progress": "In uitvoering",
+  "Include time": "Tijd opnemen",
+  "Insert a kanban board on this page": "Voeg een kanbanbord in op deze pagina",
+  "Insert an inline base on this page": "Voeg een inline base in op deze pagina",
+  "Is": "Is",
+  "Is after": "Is na",
+  "Is any of": "Is een van",
+  "Is before": "Is vóór",
+  "Is empty": "Is leeg",
+  "Is none of": "Is geen van",
+  "Is not": "Is niet",
+  "Is not empty": "Is niet leeg",
+  "Is on or after": "Is op of na",
+  "Is on or before": "Is op of vóór",
+  "Is within": "Is binnen",
+  "Keep editing": "Doorgaan met bewerken",
+  "Last edited at": "Laatst bewerkt op",
+  "Last edited by": "Laatst bewerkt door",
+  "Less than": "Kleiner dan",
+  "Link copied to clipboard": "Link gekopieerd naar klembord",
+  "Local": "Lokaal",
+  "Long text": "Lange tekst",
+  "Moved card to {{column}}": "Kaart verplaatst naar {{column}}",
+  "Moved column to {{column}}": "Kolom verplaatst naar {{column}}",
+  "Multi-select": "Meervoudige selectie",
+  "New row": "Nieuwe rij",
+  "Next month": "Volgende maand",
+  "Next week": "Volgende week",
+  "Next year": "Volgend jaar",
+  "No filters applied": "Geen filters toegepast",
+  "No match": "Geen overeenkomst",
+  "No options for this property type": "Geen opties voor dit eigenschapstype",
+  "No sorts applied": "Geen sorteringen toegepast",
+  "No value": "Geen waarde",
+  "None": "Geen",
+  "Not started": "Niet gestart",
+  "Number": "Getal",
+  "One month ago": "Een maand geleden",
+  "One month from now": "Over een maand",
+  "One week ago": "Een week geleden",
+  "One week from now": "Over een week",
+  "Open as page": "Openen als pagina",
+  "Options": "Opties",
+  "Past month": "Afgelopen maand",
+  "Past week": "Afgelopen week",
+  "Past year": "Afgelopen jaar",
+  "Percent": "Procent",
+  "Period, comma": "Punt, komma",
+  "Person": "Persoon",
+  "Please enter a valid email": "Voer een geldig e-mailadres in",
+  "Progress": "Voortgang",
+  "Property options": "Eigenschapopties",
+  "Relative": "Relatief",
+  "Rename property": "Eigenschap hernoemen",
+  "Reset": "Opnieuw instellen",
+  "Save for everyone": "Opslaan voor iedereen",
+  "Select": "Selecteren",
+  "Select a property": "Selecteer een eigenschap",
+  "Select all loaded rows": "Alle geladen rijen selecteren",
+  "Show all": "Alles tonen",
+  "Sort": "Sorteren",
+  "Sort by": "Sorteren op",
+  "Space, comma": "Spatie, komma",
+  "Space, period": "Spatie, punt",
+  "This board has no grouping property yet.": "Dit bord heeft nog geen groeperingseigenschap.",
+  "This month": "Deze maand",
+  "This year": "Dit jaar",
+  "Thousands and decimal separators": "Scheidingstekens voor duizendtallen en decimalen",
+  "Time format": "Tijdnotatie",
+  "To Do": "Te doen",
+  "Tomorrow": "Morgen",
+  "True": "Waar",
+  "Unsaved changes": "Niet-opgeslagen wijzigingen",
+  "Untitled base": "Base zonder titel",
+  "URL": "URL",
+  "Value": "Waarde",
+  "View updated for everyone": "Weergave bijgewerkt voor iedereen",
+  "You have unsaved changes. Do you want to discard them?": "Je hebt niet-opgeslagen wijzigingen. Wil je deze negeren?",
+  "{{count}} rows deleted_one": "1 rij verwijderd",
+  "{{count}} rows deleted_other": "{{count}} rijen verwijderd",
+  "{{count}} selected_one": "1 geselecteerd",
+  "{{count}} selected_other": "{{count}} geselecteerd"
 }

apps/client/public/locales/pt-BR/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Criar propriedade",
   "Hide properties": "Ocultar propriedades",
   "Find a property type": "Encontrar um tipo de propriedade",
-  "Properties": "Propriedades"
+  "Properties": "Propriedades",
+  "A property with this name already exists": "Já existe uma propriedade com este nome",
+  "Add card": "Adicionar cartão",
+  "Add filter": "Adicionar filtro",
+  "Add option": "Adicionar opção",
+  "Add sort": "Adicionar ordenação",
+  "Add view": "Adicionar visualização",
+  "All data in this column will be lost.": "Todos os dados nesta coluna serão perdidos.",
+  "Allow multiple people": "Permitir várias pessoas",
+  "Alphabetize": "Ordenar alfabeticamente",
+  "Are you sure you want to delete": "Tem certeza de que deseja excluir",
+  "Ascending": "Crescente",
+  "Base deleted": "Base excluída",
+  "Base name": "Nome da base",
+  "Base table": "Tabela da base",
+  "Card properties": "Propriedades do cartão",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Células maiores do que o limite de Texto serão truncadas e o conteúdo extra será perdido permanentemente.",
+  "Checkbox": "Caixa de seleção",
+  "Checked by default": "Marcado por padrão",
+  "Choose a property": "Escolha uma propriedade",
+  "Clear selection": "Limpar seleção",
+  "Column options": "Opções da coluna",
+  "Comma, period": "Vírgula, ponto",
+  "Complete": "Concluído",
+  "Contains": "Contém",
+  "Copy link to view": "Copiar link da visualização",
+  "Create a status property": "Criar uma propriedade de status",
+  "Created at": "Criado em",
+  "Currency": "Moeda",
+  "Decimal places": "Casas decimais",
+  "Default value": "Valor padrão",
+  "Delete property": "Excluir propriedade",
+  "Delete view": "Excluir visualização",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "Decrescente",
+  "Discard": "Descartar",
+  "Doesn't contain": "Não contém",
+  "Done": "Concluído",
+  "Edit formula": "Editar fórmula",
+  "Edit property": "Editar propriedade",
+  "Export CSV": "Exportar CSV",
+  "Failed to load base": "Falha ao carregar a base",
+  "False": "Falso",
+  "File": "Arquivo",
+  "Filter and sort changes are visible only to you": "As alterações de filtro e ordenação são visíveis somente para você",
+  "Filter by": "Filtrar por",
+  "Formula": "Fórmula",
+  "Get started with": "Começar com",
+  "Greater than": "Maior que",
+  "Group by": "Agrupar por",
+  "Group this board by a select or status property.": "Agrupe este quadro por uma propriedade de seleção ou status.",
+  "Hide all": "Ocultar tudo",
+  "Hide group": "Ocultar grupo",
+  "In Progress": "Em andamento",
+  "In progress": "Em andamento",
+  "Include time": "Incluir hora",
+  "Insert a kanban board on this page": "Inserir um quadro kanban nesta página",
+  "Insert an inline base on this page": "Inserir uma base inline nesta página",
+  "Is": "É",
+  "Is after": "É depois de",
+  "Is any of": "É qualquer um de",
+  "Is before": "É antes de",
+  "Is empty": "Está vazio",
+  "Is none of": "Não é nenhum de",
+  "Is not": "Não é",
+  "Is not empty": "Não está vazio",
+  "Is on or after": "É em ou depois de",
+  "Is on or before": "É em ou antes de",
+  "Is within": "Está dentro de",
+  "Keep editing": "Continuar editando",
+  "Last edited at": "Última edição em",
+  "Last edited by": "Última edição por",
+  "Less than": "Menor que",
+  "Link copied to clipboard": "Link copiado para a área de transferência",
+  "Local": "Local",
+  "Long text": "Texto longo",
+  "Moved card to {{column}}": "Cartão movido para {{column}}",
+  "Moved column to {{column}}": "Coluna movida para {{column}}",
+  "Multi-select": "Seleção múltipla",
+  "New row": "Nova linha",
+  "Next month": "Próximo mês",
+  "Next week": "Próxima semana",
+  "Next year": "Próximo ano",
+  "No filters applied": "Nenhum filtro aplicado",
+  "No match": "Sem correspondência",
+  "No options for this property type": "Sem opções para este tipo de propriedade",
+  "No sorts applied": "Nenhuma ordenação aplicada",
+  "No value": "Sem valor",
+  "None": "Nenhum",
+  "Not started": "Não iniciado",
+  "Number": "Número",
+  "One month ago": "Há um mês",
+  "One month from now": "Daqui a um mês",
+  "One week ago": "Há uma semana",
+  "One week from now": "Daqui a uma semana",
+  "Open as page": "Abrir como página",
+  "Options": "Opções",
+  "Past month": "Mês passado",
+  "Past week": "Semana passada",
+  "Past year": "Ano passado",
+  "Percent": "Porcentagem",
+  "Period, comma": "Ponto, vírgula",
+  "Person": "Pessoa",
+  "Please enter a valid email": "Por favor, insira um e-mail válido",
+  "Progress": "Progresso",
+  "Property options": "Opções da propriedade",
+  "Relative": "Relativo",
+  "Rename property": "Renomear propriedade",
+  "Reset": "Redefinir",
+  "Save for everyone": "Salvar para todos",
+  "Select": "Seleção",
+  "Select a property": "Selecione uma propriedade",
+  "Select all loaded rows": "Selecionar todas as linhas carregadas",
+  "Show all": "Mostrar tudo",
+  "Sort": "Ordenar",
+  "Sort by": "Ordenar por",
+  "Space, comma": "Espaço, vírgula",
+  "Space, period": "Espaço, ponto",
+  "This board has no grouping property yet.": "Este quadro ainda não tem uma propriedade de agrupamento.",
+  "This month": "Este mês",
+  "This year": "Este ano",
+  "Thousands and decimal separators": "Separadores de milhares e decimais",
+  "Time format": "Formato de hora",
+  "To Do": "A fazer",
+  "Tomorrow": "Amanhã",
+  "True": "Verdadeiro",
+  "Unsaved changes": "Alterações não salvas",
+  "Untitled base": "Base sem título",
+  "URL": "URL",
+  "Value": "Valor",
+  "View updated for everyone": "Visualização atualizada para todos",
+  "You have unsaved changes. Do you want to discard them?": "Você tem alterações não salvas. Deseja descartá-las?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/ru-RU/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Создать свойство",
   "Hide properties": "Скрыть свойства",
   "Find a property type": "Найти тип свойства",
-  "Properties": "Свойства"
+  "Properties": "Свойства",
+  "A property with this name already exists": "Свойство с таким именем уже существует",
+  "Add card": "Добавить карточку",
+  "Add filter": "Добавить фильтр",
+  "Add option": "Добавить вариант",
+  "Add sort": "Добавить сортировку",
+  "Add view": "Добавить представление",
+  "All data in this column will be lost.": "Все данные в этом столбце будут потеряны.",
+  "Allow multiple people": "Разрешить нескольких пользователей",
+  "Alphabetize": "По алфавиту",
+  "Are you sure you want to delete": "Вы уверены, что хотите удалить",
+  "Ascending": "По возрастанию",
+  "Base deleted": "База удалена",
+  "Base name": "Название базы",
+  "Base table": "Таблица базы",
+  "Card properties": "Свойства карточки",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Ячейки, длина которых превышает ограничение для текста, будут обрезаны, а лишнее содержимое будет безвозвратно потеряно.",
+  "Checkbox": "Флажок",
+  "Checked by default": "Отмечено по умолчанию",
+  "Choose a property": "Выберите свойство",
+  "Clear selection": "Очистить выбор",
+  "Column options": "Параметры столбца",
+  "Comma, period": "Запятая, точка",
+  "Complete": "Завершено",
+  "Contains": "Содержит",
+  "Copy link to view": "Скопировать ссылку на представление",
+  "Create a status property": "Создать свойство статуса",
+  "Created at": "Создано",
+  "Currency": "Валюта",
+  "Decimal places": "Десятичные знаки",
+  "Default value": "Значение по умолчанию",
+  "Delete property": "Удалить свойство",
+  "Delete view": "Удалить представление",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "По убыванию",
+  "Discard": "Отменить",
+  "Doesn't contain": "Не содержит",
+  "Done": "Готово",
+  "Edit formula": "Редактировать формулу",
+  "Edit property": "Редактировать свойство",
+  "Export CSV": "Экспорт CSV",
+  "Failed to load base": "Не удалось загрузить базу",
+  "False": "Ложь",
+  "File": "Файл",
+  "Filter and sort changes are visible only to you": "Изменения фильтра и сортировки видны только вам",
+  "Filter by": "Фильтр по",
+  "Formula": "Формула",
+  "Get started with": "Начать работу с",
+  "Greater than": "Больше чем",
+  "Group by": "Группировать по",
+  "Group this board by a select or status property.": "Сгруппируйте эту доску по свойству выбора или статуса.",
+  "Hide all": "Скрыть все",
+  "Hide group": "Скрыть группу",
+  "In Progress": "В процессе",
+  "In progress": "В процессе",
+  "Include time": "Включить время",
+  "Insert a kanban board on this page": "Вставить канбан-доску на эту страницу",
+  "Insert an inline base on this page": "Вставить встроенную базу на эту страницу",
+  "Is": "Равно",
+  "Is after": "После",
+  "Is any of": "Совпадает с любым из",
+  "Is before": "До",
+  "Is empty": "Пусто",
+  "Is none of": "Не совпадает ни с одним из",
+  "Is not": "Не равно",
+  "Is not empty": "Не пусто",
+  "Is on or after": "В этот день или позже",
+  "Is on or before": "В этот день или раньше",
+  "Is within": "Находится в пределах",
+  "Keep editing": "Продолжить редактирование",
+  "Last edited at": "Последнее изменение",
+  "Last edited by": "Последний изменивший",
+  "Less than": "Меньше чем",
+  "Link copied to clipboard": "Ссылка скопирована в буфер обмена",
+  "Local": "Локальный",
+  "Long text": "Длинный текст",
+  "Moved card to {{column}}": "Карточка перемещена в {{column}}",
+  "Moved column to {{column}}": "Столбец перемещён в {{column}}",
+  "Multi-select": "Множественный выбор",
+  "New row": "Новая строка",
+  "Next month": "Следующий месяц",
+  "Next week": "Следующая неделя",
+  "Next year": "Следующий год",
+  "No filters applied": "Фильтры не применены",
+  "No match": "Нет совпадений",
+  "No options for this property type": "Для этого типа свойства нет параметров",
+  "No sorts applied": "Сортировка не применена",
+  "No value": "Нет значения",
+  "None": "Нет",
+  "Not started": "Не начато",
+  "Number": "Число",
+  "One month ago": "Месяц назад",
+  "One month from now": "Через месяц",
+  "One week ago": "Неделю назад",
+  "One week from now": "Через неделю",
+  "Open as page": "Открыть как страницу",
+  "Options": "Параметры",
+  "Past month": "Прошлый месяц",
+  "Past week": "Прошлая неделя",
+  "Past year": "Прошлый год",
+  "Percent": "Процент",
+  "Period, comma": "Точка, запятая",
+  "Person": "Пользователь",
+  "Please enter a valid email": "Пожалуйста, введите корректный адрес электронной почты",
+  "Progress": "Прогресс",
+  "Property options": "Параметры свойства",
+  "Relative": "Относительный",
+  "Rename property": "Переименовать свойство",
+  "Reset": "Сбросить",
+  "Save for everyone": "Сохранить для всех",
+  "Select": "Выбор",
+  "Select a property": "Выберите свойство",
+  "Select all loaded rows": "Выбрать все загруженные строки",
+  "Show all": "Показать все",
+  "Sort": "Сортировка",
+  "Sort by": "Сортировать по",
+  "Space, comma": "Пробел, запятая",
+  "Space, period": "Пробел, точка",
+  "This board has no grouping property yet.": "У этой доски пока нет свойства для группировки.",
+  "This month": "Этот месяц",
+  "This year": "Этот год",
+  "Thousands and decimal separators": "Разделители тысяч и десятичных знаков",
+  "Time format": "Формат времени",
+  "To Do": "К выполнению",
+  "Tomorrow": "Завтра",
+  "True": "Истина",
+  "Unsaved changes": "Несохранённые изменения",
+  "Untitled base": "База без названия",
+  "URL": "URL",
+  "Value": "Значение",
+  "View updated for everyone": "Представление обновлено для всех",
+  "You have unsaved changes. Do you want to discard them?": "У вас есть несохранённые изменения. Хотите их отменить?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/uk-UA/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "Створити властивість",
   "Hide properties": "Приховати властивості",
   "Find a property type": "Знайти тип властивості",
-  "Properties": "Властивості"
+  "Properties": "Властивості",
+  "A property with this name already exists": "Властивість із такою назвою вже існує",
+  "Add card": "Додати картку",
+  "Add filter": "Додати фільтр",
+  "Add option": "Додати опцію",
+  "Add sort": "Додати сортування",
+  "Add view": "Додати подання",
+  "All data in this column will be lost.": "Усі дані в цьому стовпці буде втрачено.",
+  "Allow multiple people": "Дозволити кількох людей",
+  "Alphabetize": "За алфавітом",
+  "Are you sure you want to delete": "Ви впевнені, що хочете видалити",
+  "Ascending": "За зростанням",
+  "Base deleted": "Базу видалено",
+  "Base name": "Назва бази",
+  "Base table": "Таблиця бази",
+  "Card properties": "Властивості картки",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Клітинки, довші за обмеження для тексту, буде обрізано, а зайвий вміст буде безповоротно втрачено.",
+  "Checkbox": "Прапорець",
+  "Checked by default": "Позначено за замовчуванням",
+  "Choose a property": "Оберіть властивість",
+  "Clear selection": "Очистити вибір",
+  "Column options": "Параметри стовпця",
+  "Comma, period": "Кома, крапка",
+  "Complete": "Завершено",
+  "Contains": "Містить",
+  "Copy link to view": "Скопіювати посилання на подання",
+  "Create a status property": "Створити властивість статусу",
+  "Created at": "Створено",
+  "Currency": "Валюта",
+  "Decimal places": "Десяткові знаки",
+  "Default value": "Значення за замовчуванням",
+  "Delete property": "Видалити властивість",
+  "Delete view": "Видалити подання",
+  "Delete {{count}} rows?_one": "Delete 1 row?",
+  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Descending": "За спаданням",
+  "Discard": "Скасувати",
+  "Doesn't contain": "Не містить",
+  "Done": "Готово",
+  "Edit formula": "Редагувати формулу",
+  "Edit property": "Редагувати властивість",
+  "Export CSV": "Експорт CSV",
+  "Failed to load base": "Не вдалося завантажити базу",
+  "False": "Хибність",
+  "File": "Файл",
+  "Filter and sort changes are visible only to you": "Зміни фільтрів і сортування видимі лише вам",
+  "Filter by": "Фільтрувати за",
+  "Formula": "Формула",
+  "Get started with": "Почніть із",
+  "Greater than": "Більше ніж",
+  "Group by": "Групувати за",
+  "Group this board by a select or status property.": "Згрупуйте цю дошку за властивістю вибору або статусу.",
+  "Hide all": "Приховати все",
+  "Hide group": "Приховати групу",
+  "In Progress": "У процесі",
+  "In progress": "У процесі",
+  "Include time": "Включити час",
+  "Insert a kanban board on this page": "Вставити канбан-дошку на цю сторінку",
+  "Insert an inline base on this page": "Вставити вбудовану базу на цю сторінку",
+  "Is": "Є",
+  "Is after": "Після",
+  "Is any of": "Є одним із",
+  "Is before": "До",
+  "Is empty": "Порожнє",
+  "Is none of": "Не є жодним із",
+  "Is not": "Не є",
+  "Is not empty": "Не порожнє",
+  "Is on or after": "У цей день або пізніше",
+  "Is on or before": "У цей день або раніше",
+  "Is within": "У межах",
+  "Keep editing": "Продовжити редагування",
+  "Last edited at": "Востаннє відредаговано",
+  "Last edited by": "Востаннє відредагував",
+  "Less than": "Менше ніж",
+  "Link copied to clipboard": "Посилання скопійовано в буфер обміну",
+  "Local": "Локальний",
+  "Long text": "Довгий текст",
+  "Moved card to {{column}}": "Картку переміщено до {{column}}",
+  "Moved column to {{column}}": "Стовпець переміщено до {{column}}",
+  "Multi-select": "Мультивибір",
+  "New row": "Новий рядок",
+  "Next month": "Наступного місяця",
+  "Next week": "Наступного тижня",
+  "Next year": "Наступного року",
+  "No filters applied": "Фільтри не застосовано",
+  "No match": "Немає збігів",
+  "No options for this property type": "Немає опцій для цього типу властивості",
+  "No sorts applied": "Сортування не застосовано",
+  "No value": "Немає значення",
+  "None": "Немає",
+  "Not started": "Не розпочато",
+  "Number": "Число",
+  "One month ago": "Місяць тому",
+  "One month from now": "Через місяць",
+  "One week ago": "Тиждень тому",
+  "One week from now": "Через тиждень",
+  "Open as page": "Відкрити як сторінку",
+  "Options": "Опції",
+  "Past month": "За минулий місяць",
+  "Past week": "За минулий тиждень",
+  "Past year": "За минулий рік",
+  "Percent": "Відсоток",
+  "Period, comma": "Крапка, кома",
+  "Person": "Особа",
+  "Please enter a valid email": "Будь ласка, введіть коректну електронну адресу",
+  "Progress": "Прогрес",
+  "Property options": "Параметри властивості",
+  "Relative": "Відносний",
+  "Rename property": "Перейменувати властивість",
+  "Reset": "Скинути",
+  "Save for everyone": "Зберегти для всіх",
+  "Select": "Вибір",
+  "Select a property": "Виберіть властивість",
+  "Select all loaded rows": "Вибрати всі завантажені рядки",
+  "Show all": "Показати все",
+  "Sort": "Сортування",
+  "Sort by": "Сортувати за",
+  "Space, comma": "Пробіл, кома",
+  "Space, period": "Пробіл, крапка",
+  "This board has no grouping property yet.": "Ця дошка ще не має властивості групування.",
+  "This month": "Цього місяця",
+  "This year": "Цього року",
+  "Thousands and decimal separators": "Роздільники тисяч і десяткових знаків",
+  "Time format": "Формат часу",
+  "To Do": "До виконання",
+  "Tomorrow": "Завтра",
+  "True": "Істина",
+  "Unsaved changes": "Незбережені зміни",
+  "Untitled base": "База без назви",
+  "URL": "URL",
+  "Value": "Значення",
+  "View updated for everyone": "Подання оновлено для всіх",
+  "You have unsaved changes. Do you want to discard them?": "У вас є незбережені зміни. Хочете їх скасувати?",
+  "{{count}} rows deleted_one": "1 row deleted",
+  "{{count}} rows deleted_other": "{{count}} rows deleted",
+  "{{count}} selected_one": "1 selected",
+  "{{count}} selected_other": "{{count}} selected"
 }

apps/client/public/locales/zh-CN/translation.json

@@ -1153,5 +1153,141 @@
   "Create property": "创建属性",
   "Hide properties": "隐藏属性",
   "Find a property type": "查找属性类型",
-  "Properties": "属性"
+  "Properties": "属性",
+  "A property with this name already exists": "已存在同名属性",
+  "Add card": "添加卡片",
+  "Add filter": "添加筛选",
+  "Add option": "添加选项",
+  "Add sort": "添加排序",
+  "Add view": "添加视图",
+  "All data in this column will be lost.": "此列中的所有数据都将丢失。",
+  "Allow multiple people": "允许多人",
+  "Alphabetize": "按字母顺序",
+  "Are you sure you want to delete": "您确定要删除",
+  "Ascending": "升序",
+  "Base deleted": "资料库已删除",
+  "Base name": "资料库名称",
+  "Base table": "资料库表",
+  "Card properties": "卡片属性",
+  "Cells longer than the Text limit will be truncated and the extra content permanently lost.": "超出文本长度限制的单元格内容将被截断，额外内容将永久丢失。",
+  "Checkbox": "复选框",
+  "Checked by default": "默认选中",
+  "Choose a property": "选择一个属性",
+  "Clear selection": "清除选择",
+  "Column options": "列选项",
+  "Comma, period": "逗号、句点",
+  "Complete": "完成",
+  "Contains": "包含",
+  "Copy link to view": "复制视图链接",
+  "Create a status property": "创建状态属性",
+  "Created at": "创建于",
+  "Currency": "货币",
+  "Decimal places": "小数位数",
+  "Default value": "默认值",
+  "Delete property": "删除属性",
+  "Delete view": "删除视图",
+  "Delete {{count}} rows?_one": "删除 1 行？",
+  "Delete {{count}} rows?_other": "删除 {{count}} 行？",
+  "Descending": "降序",
+  "Discard": "放弃",
+  "Doesn't contain": "不包含",
+  "Done": "完成",
+  "Edit formula": "编辑公式",
+  "Edit property": "编辑属性",
+  "Export CSV": "导出 CSV",
+  "Failed to load base": "加载资料库失败",
+  "False": "假",
+  "File": "文件",
+  "Filter and sort changes are visible only to you": "筛选和排序更改仅对您可见",
+  "Filter by": "筛选条件",
+  "Formula": "公式",
+  "Get started with": "开始使用",
+  "Greater than": "大于",
+  "Group by": "分组依据",
+  "Group this board by a select or status property.": "按选择或状态属性对此看板进行分组。",
+  "Hide all": "全部隐藏",
+  "Hide group": "隐藏分组",
+  "In Progress": "进行中",
+  "In progress": "进行中",
+  "Include time": "包含时间",
+  "Insert a kanban board on this page": "在此页面插入一个看板",
+  "Insert an inline base on this page": "在此页面插入一个内联资料库",
+  "Is": "是",
+  "Is after": "在此之后",
+  "Is any of": "是其中之一",
+  "Is before": "在此之前",
+  "Is empty": "为空",
+  "Is none of": "都不是",
+  "Is not": "不是",
+  "Is not empty": "不为空",
+  "Is on or after": "在此日期或之后",
+  "Is on or before": "在此日期或之前",
+  "Is within": "在范围内",
+  "Keep editing": "继续编辑",
+  "Last edited at": "最后编辑于",
+  "Last edited by": "最后编辑者",
+  "Less than": "小于",
+  "Link copied to clipboard": "链接已复制到剪贴板",
+  "Local": "本地",
+  "Long text": "长文本",
+  "Moved card to {{column}}": "已将卡片移动到 {{column}}",
+  "Moved column to {{column}}": "已将列移动到 {{column}}",
+  "Multi-select": "多选",
+  "New row": "新行",
+  "Next month": "下个月",
+  "Next week": "下周",
+  "Next year": "明年",
+  "No filters applied": "未应用筛选",
+  "No match": "无匹配项",
+  "No options for this property type": "此属性类型没有可用选项",
+  "No sorts applied": "未应用排序",
+  "No value": "无值",
+  "None": "无",
+  "Not started": "未开始",
+  "Number": "数字",
+  "One month ago": "一个月前",
+  "One month from now": "从现在起一个月后",
+  "One week ago": "一周前",
+  "One week from now": "从现在起一周后",
+  "Open as page": "作为页面打开",
+  "Options": "选项",
+  "Past month": "过去一个月",
+  "Past week": "过去一周",
+  "Past year": "过去一年",
+  "Percent": "百分比",
+  "Period, comma": "句点、逗号",
+  "Person": "人员",
+  "Please enter a valid email": "请输入有效的电子邮件地址",
+  "Progress": "进度",
+  "Property options": "属性选项",
+  "Relative": "相对",
+  "Rename property": "重命名属性",
+  "Reset": "重置",
+  "Save for everyone": "保存给所有人",
+  "Select": "选择",
+  "Select a property": "选择一个属性",
+  "Select all loaded rows": "选择所有已加载的行",
+  "Show all": "显示全部",
+  "Sort": "排序",
+  "Sort by": "排序依据",
+  "Space, comma": "空格、逗号",
+  "Space, period": "空格、句点",
+  "This board has no grouping property yet.": "此看板尚无分组属性。",
+  "This month": "本月",
+  "This year": "今年",
+  "Thousands and decimal separators": "千位分隔符和小数分隔符",
+  "Time format": "时间格式",
+  "To Do": "待办",
+  "Tomorrow": "明天",
+  "True": "真",
+  "Unsaved changes": "未保存的更改",
+  "Untitled base": "未命名资料库",
+  "URL": "网址",
+  "Value": "值",
+  "View updated for everyone": "已为所有人更新视图",
+  "You have unsaved changes. Do you want to discard them?": "您有未保存的更改。要放弃这些更改吗？",
+  "{{count}} rows deleted_one": "已删除 1 行",
+  "{{count}} rows deleted_other": "已删除 {{count}} 行",
+  "{{count}} selected_one": "已选择 1 项",
+  "{{count}} selected_other": "已选择 {{count}} 项"
 }

apps/client/src/components/ui/checkbox-menu-item.tsx

@@ -0,0 +1,12 @@
+import { UnstyledButton } from "@mantine/core";
+import { type ComponentPropsWithoutRef, forwardRef } from "react";
+
+// Menu.Item hard-codes role="menuitem"; use as its `component` to restore role="menuitemcheckbox" so aria-checked works.
+export const CheckboxMenuItem = forwardRef<
+  HTMLButtonElement,
+  ComponentPropsWithoutRef<"button">
+>((props, ref) => (
+  <UnstyledButton ref={ref} {...props} role="menuitemcheckbox" />
+));
+
+CheckboxMenuItem.displayName = "CheckboxMenuItem";

apps/client/src/components/ui/document-title.test.tsx

@@ -0,0 +1,45 @@
+import { describe, expect, it, beforeEach } from "vitest";
+import { render } from "@testing-library/react";
+import { HelmetProvider } from "react-helmet-async";
+import { DocumentTitle } from "./document-title.tsx";
+
+const renderTitle = (ui: React.ReactNode) =>
+  render(<HelmetProvider>{ui}</HelmetProvider>);
+
+describe("DocumentTitle", () => {
+  beforeEach(() => {
+    document.head.innerHTML = "<title>Docmost</title>";
+  });
+
+  it("appends the app name", () => {
+    renderTitle(<DocumentTitle title="Home" />);
+    expect(document.title).toBe("Home - Docmost");
+  });
+
+  it("omits the app name when asked", () => {
+    renderTitle(<DocumentTitle title="My page" withAppName={false} />);
+    expect(document.title).toBe("My page");
+  });
+
+  it("falls back to the app name without a title", () => {
+    renderTitle(<DocumentTitle />);
+    expect(document.title).toBe("Docmost");
+  });
+
+  it("never renders an empty title", () => {
+    renderTitle(<DocumentTitle title="Spaces" />);
+    const titles = Array.from(document.querySelectorAll("head > title"));
+    expect(titles.every((node) => node.textContent !== "")).toBe(true);
+  });
+
+  it("renders extra head children", () => {
+    renderTitle(
+      <DocumentTitle title="Shared">
+        <meta name="robots" content="noindex" />
+      </DocumentTitle>,
+    );
+    expect(
+      document.querySelector('head > meta[name="robots"]')?.getAttribute("content"),
+    ).toBe("noindex");
+  });
+});

apps/client/src/components/ui/document-title.tsx

@@ -0,0 +1,29 @@
+import React from "react";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
+
+type DocumentTitleProps = {
+  title?: string;
+  withAppName?: boolean;
+  children?: React.ReactNode;
+};
+
+export function DocumentTitle({
+  title,
+  withAppName = true,
+  children,
+}: DocumentTitleProps) {
+  const appName = getAppName();
+
+  let documentTitle = appName;
+  if (title) {
+    documentTitle = withAppName ? `${title} - ${appName}` : title;
+  }
+
+  return (
+    <Helmet>
+      <title>{documentTitle}</title>
+      {children}
+    </Helmet>
+  );
+}

apps/client/src/components/ui/error-404.tsx

@@ -1,17 +1,15 @@
 import { Title, Text, Button, Container, Group } from "@mantine/core";
 import classes from "./error-404.module.css";
 import { Link } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export function Error404() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>{t("404 page not found")} - Docmost</title>
-      </Helmet>
+      <DocumentTitle title={t("404 page not found")} />
       <Container className={classes.root}>
         <Title className={classes.title}>{t("404 page not found")}</Title>
         <Text c="dimmed" size="lg" ta="center" className={classes.description}>

apps/client/src/ee/ai-chat/components/chat-input.tsx

@@ -255,6 +255,7 @@ export default function ChatInput({
     },
     content: "",
     editable: true,
+    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     autofocus: autofocus ? "end" : false,

apps/client/src/ee/ai/pages/ai-settings.tsx

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -15,6 +13,7 @@ import { Feature } from "@/ee/features";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { isCloud } from "@/lib/config.ts";
 import { useLocation, useNavigate } from "react-router-dom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AiSettings() {
   const { t } = useTranslation();
@@ -40,9 +39,7 @@ export default function AiSettings() {
 
   return (
     <>
-      <Helmet>
-        <title>AI settings - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title="AI settings" />
       <SettingsTitle title={t("AI settings")} />
 
       <Tabs color="dark" value={activeTab} onChange={handleTabChange}>

apps/client/src/ee/api-key/pages/user-api-keys.tsx

@@ -1,10 +1,9 @@
 import React, { useState } from "react";
 import { Anchor, Alert, Button, Group, Space, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
-import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName, getAppUrl } from "@/lib/config";
+import { getAppUrl } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -17,6 +16,7 @@ import { IApiKey } from "@/ee/api-key";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function UserApiKeys() {
   const { t } = useTranslation();
@@ -49,11 +49,7 @@ export default function UserApiKeys() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("API keys")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("API keys")} />
 
       <SettingsTitle title={t("API keys")} />
 

apps/client/src/ee/api-key/pages/workspace-api-keys.tsx

@@ -1,9 +1,7 @@
 import React, { useState } from "react";
 import { Anchor, Button, Divider, Group, Space, Text } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -15,6 +13,7 @@ import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
 import { IApiKey } from "@/ee/api-key";
 import useUserRole from '@/hooks/use-user-role.tsx';
 import RestrictApiToAdmins from "@/ee/api-key/components/restrict-api-to-admins";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function WorkspaceApiKeys() {
   const { t } = useTranslation();
@@ -47,11 +46,7 @@ export default function WorkspaceApiKeys() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("API management")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("API management")} />
 
       <SettingsTitle title={t("API management")} />
 

apps/client/src/ee/audit/pages/audit-logs.tsx

@@ -10,11 +10,9 @@ import {
   Text,
   Tooltip,
 } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSettings } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import {
@@ -26,6 +24,7 @@ import { IAuditLogParams } from "@/ee/audit/types/audit.types";
 import { eventFilterOptions } from "@/ee/audit/lib/audit-event-labels";
 import AuditLogsTable from "@/ee/audit/components/audit-logs-table";
 import useUserRole from "@/hooks/use-user-role";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 type RetentionUnit = "days" | "months" | "years";
 
@@ -97,11 +96,7 @@ export default function AuditLogs() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Audit log")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Audit log")} />
 
       <SettingsTitle title={t("Audit log")} />
 

apps/client/src/ee/base/components/kanban/base-kanban.tsx

@@ -30,7 +30,7 @@ type BaseKanbanProps = {
 
 export function BaseKanban({ base, view, pageId, embedded, editable, viewFilter }: BaseKanbanProps) {
   const { t } = useTranslation();
-  const { groupByPropertyId, columns, hasValidGroupBy } = useKanbanColumns(base, view);
+  const { groupByPropertyId, groupByProperty, columns, hasValidGroupBy } = useKanbanColumns(base, view);
   const updateView = useUpdateViewMutation();
   const moveCard = useKanbanMoveCardMutation();
   const { openRow } = useRowDetailModal(pageId);
@@ -201,6 +201,7 @@ export function BaseKanban({ base, view, pageId, embedded, editable, viewFilter
           column={column}
           viewFilter={viewFilter}
           groupByPropertyId={groupByPropertyId!}
+          groupByProperty={groupByProperty}
           canEdit={editable}
           onOpenRow={handleOpenRow}
           onHide={hideColumn}

apps/client/src/ee/base/components/kanban/kanban-column-header.tsx

@@ -1,24 +1,27 @@
 import { useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { ActionIcon, Menu, Text } from "@mantine/core";
-import { IconDots, IconPlus, IconGripVertical } from "@tabler/icons-react";
+import { ActionIcon, Text } from "@mantine/core";
+import { IconPlus, IconGripVertical } from "@tabler/icons-react";
 import clsx from "clsx";
-import { KanbanColumn } from "@/ee/base/types/base.types";
+import { IBaseProperty, KanbanColumn } from "@/ee/base/types/base.types";
 import { choiceColor } from "@/ee/base/components/cells/choice-color";
 import { useKanbanColumnDnd } from "@/ee/base/hooks/use-kanban-column-dnd";
 import { BaseDropEdgeIndicator } from "@/ee/base/components/grid/base-drop-edge-indicator";
+import { KanbanColumnTitle } from "@/ee/base/components/kanban/kanban-column-title";
+import { KanbanColumnMenu } from "@/ee/base/components/kanban/kanban-column-menu";
 import classes from "@/ee/base/styles/kanban.module.css";
 
 type KanbanColumnHeaderProps = {
   column: KanbanColumn;
   pageId: string;
+  property: IBaseProperty | undefined;
   count?: string;
   canEdit: boolean;
   onHide: () => void;
   onAddCard: () => void;
 };
 
-export function KanbanColumnHeader({ column, pageId, count, canEdit, onHide, onAddCard }: KanbanColumnHeaderProps) {
+export function KanbanColumnHeader({ column, pageId, property, count, canEdit, onHide, onAddCard }: KanbanColumnHeaderProps) {
   const { t } = useTranslation();
   const dotColor = column.color
     ? choiceColor(column.color).color as string
@@ -49,22 +52,13 @@ export function KanbanColumnHeader({ column, pageId, count, canEdit, onHide, onA
           background: dotColor,
         }}
       />
-      <Text fw={600} size="sm" flex={1} truncate>
-        {column.isNoValue ? t("No value") : column.name}
-      </Text>
+      <KanbanColumnTitle column={column} property={property} pageId={pageId} canEdit={canEdit} />
       {count !== undefined && <Text className={classes.count}>{count}</Text>}
       {canEdit && (
         <>
-          <Menu position="bottom-end" withinPortal>
-            <Menu.Target>
-              <ActionIcon variant="subtle" size="sm" color="gray" aria-label={t("Column options")}>
-                <IconDots size={14} />
-              </ActionIcon>
-            </Menu.Target>
-            <Menu.Dropdown>
-              <Menu.Item onClick={onHide}>{t("Hide group")}</Menu.Item>
-            </Menu.Dropdown>
-          </Menu>
+          {property && (
+            <KanbanColumnMenu property={property} pageId={pageId} onHide={onHide} />
+          )}
           <ActionIcon variant="subtle" size="sm" color="gray" aria-label={t("Add card")} onClick={onAddCard}>
             <IconPlus size={14} />
           </ActionIcon>

apps/client/src/ee/base/components/kanban/kanban-column-menu.tsx

@@ -0,0 +1,119 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ActionIcon, Popover, Stack } from "@mantine/core";
+import { IconDots, IconEyeOff, IconSettings } from "@tabler/icons-react";
+import { useAtom } from "jotai";
+import {
+  propertyMenuCloseRequestAtomFamily,
+  propertyMenuDirtyAtomFamily,
+} from "@/ee/base/atoms/base-atoms";
+import { IBaseProperty } from "@/ee/base/types/base.types";
+import {
+  MenuItem,
+  PropertyMenuContent,
+} from "@/ee/base/components/property/property-menu";
+
+type KanbanColumnMenuProps = {
+  property: IBaseProperty;
+  pageId: string;
+  onHide: () => void;
+};
+
+export function KanbanColumnMenu({ property, pageId, onHide }: KanbanColumnMenuProps) {
+  const { t } = useTranslation();
+  const [opened, setOpened] = useState(false);
+  const [view, setView] = useState<"menu" | "property">("menu");
+  const [dirty, setDirty] = useAtom(propertyMenuDirtyAtomFamily(pageId)) as unknown as [boolean, (val: boolean) => void];
+  const [closeRequest, setCloseRequest] = useAtom(propertyMenuCloseRequestAtomFamily(pageId)) as unknown as [number, (val: number) => void];
+
+  const handleClose = useCallback(() => {
+    setOpened(false);
+    setView("menu");
+  }, []);
+
+  const wasOpenedRef = useRef(opened);
+  useEffect(() => {
+    if (wasOpenedRef.current && !opened) setDirty(false);
+    wasOpenedRef.current = opened;
+  }, [opened, setDirty]);
+
+  const handleOpenChange = useCallback(
+    (next: boolean) => {
+      if (next) return;
+      if (dirty) {
+        setCloseRequest(closeRequest + 1);
+      } else {
+        handleClose();
+      }
+    },
+    [dirty, closeRequest, setCloseRequest, handleClose],
+  );
+
+  const toggle = useCallback(() => {
+    if (opened) {
+      handleOpenChange(false);
+    } else if (!dirty) {
+      setOpened(true);
+    }
+  }, [opened, dirty, handleOpenChange]);
+
+  return (
+    <Popover
+      opened={opened}
+      onChange={handleOpenChange}
+      onClose={handleClose}
+      position="bottom-end"
+      shadow="md"
+      width={260}
+      trapFocus
+      returnFocus
+      withinPortal
+      closeOnClickOutside
+      closeOnEscape
+    >
+      <Popover.Target>
+        <ActionIcon
+          variant="subtle"
+          size="sm"
+          color="gray"
+          aria-label={t("Column options")}
+          onClick={toggle}
+        >
+          <IconDots size={14} />
+        </ActionIcon>
+      </Popover.Target>
+      <Popover.Dropdown
+        p={0}
+        onClick={(e) => e.stopPropagation()}
+        onKeyDown={(e) => e.stopPropagation()}
+      >
+        {view === "menu" ? (
+          <Stack gap={0} p={4}>
+            <MenuItem
+              icon={<IconSettings size={14} />}
+              label={t("Edit property")}
+              onClick={() => setView("property")}
+            />
+            <MenuItem
+              icon={<IconEyeOff size={14} />}
+              label={t("Hide group")}
+              onClick={() => {
+                handleClose();
+                onHide();
+              }}
+            />
+          </Stack>
+        ) : (
+          <PropertyMenuContent
+            property={property}
+            opened={opened}
+            onClose={handleClose}
+            onDirtyChange={setDirty}
+            pageId={pageId}
+            initialPanel={property.pendingType ? "main" : "options"}
+          />
+        )}
+      </Popover.Dropdown>
+    </Popover>
+  );
+}

apps/client/src/ee/base/components/kanban/kanban-column-title.tsx

@@ -0,0 +1,113 @@
+import { useCallback, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button, Group, Popover, Text, TextInput, UnstyledButton } from "@mantine/core";
+import { IBaseProperty, KanbanColumn, SelectTypeOptions } from "@/ee/base/types/base.types";
+import { useUpdatePropertyMutation } from "@/ee/base/queries/base-property-query";
+import classes from "@/ee/base/styles/kanban.module.css";
+
+type KanbanColumnTitleProps = {
+  column: KanbanColumn;
+  property: IBaseProperty | undefined;
+  pageId: string;
+  canEdit: boolean;
+};
+
+export function KanbanColumnTitle({ column, property, pageId, canEdit }: KanbanColumnTitleProps) {
+  const { t } = useTranslation();
+  const [opened, setOpened] = useState(false);
+  const [draft, setDraft] = useState("");
+  const updateProperty = useUpdatePropertyMutation();
+
+  const commit = useCallback(() => {
+    setOpened(false);
+    const name = draft.trim();
+    const options = property?.typeOptions as SelectTypeOptions | undefined;
+    if (!property || !options || !name || name === column.name) return;
+    if (!options.choices.some((c) => c.id === column.key)) return;
+    updateProperty.mutate({
+      propertyId: property.id,
+      pageId,
+      typeOptions: {
+        ...options,
+        choices: options.choices.map((c) =>
+          c.id === column.key ? { ...c, name } : c,
+        ),
+      },
+    });
+  }, [draft, property, column.name, column.key, pageId, updateProperty]);
+
+  const toggle = useCallback(() => {
+    if (opened) {
+      commit();
+    } else {
+      setDraft(column.name);
+      setOpened(true);
+    }
+  }, [opened, commit, column.name]);
+
+  const cancel = useCallback(() => setOpened(false), []);
+
+  if (!canEdit || column.isNoValue || !property) {
+    return (
+      <Text fw={600} size="sm" flex={1} truncate>
+        {column.isNoValue ? t("No value") : column.name}
+      </Text>
+    );
+  }
+
+  return (
+    <Popover
+      opened={opened}
+      onChange={(next) => {
+        if (!next) commit();
+      }}
+      position="bottom-start"
+      shadow="md"
+      width={240}
+      withinPortal
+      trapFocus
+      returnFocus
+      closeOnClickOutside
+      closeOnEscape={false}
+    >
+      <Popover.Target>
+        <UnstyledButton className={classes.columnTitleButton} onClick={toggle}>
+          <Text fw={600} size="sm" truncate flex={1} ta="left">
+            {column.name}
+          </Text>
+        </UnstyledButton>
+      </Popover.Target>
+      <Popover.Dropdown
+        p="xs"
+        onClick={(e) => e.stopPropagation()}
+        onKeyDown={(e) => {
+          if (e.key === "Escape") {
+            e.preventDefault();
+            e.stopPropagation();
+            cancel();
+          }
+        }}
+      >
+        <Group gap="xs" wrap="nowrap">
+          <TextInput
+            size="xs"
+            flex={1}
+            value={draft}
+            data-autofocus
+            onFocus={(e) => e.currentTarget.select()}
+            onChange={(e) => setDraft(e.currentTarget.value)}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                e.preventDefault();
+                commit();
+              }
+            }}
+          />
+          <Button size="xs" onClick={commit}>
+            {t("Done")}
+          </Button>
+        </Group>
+      </Popover.Dropdown>
+    </Popover>
+  );
+}

apps/client/src/ee/base/components/kanban/kanban-column.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { generateJitteredKeyBetween } from "fractional-indexing-jittered";
 import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
-import { type IBase, type IBaseRow, type IBaseView, type FilterGroup, type KanbanColumn as KanbanColumnType, KANBAN_CARD_DRAG_TYPE } from "@/ee/base/types/base.types";
+import { type IBase, type IBaseProperty, type IBaseRow, type IBaseView, type FilterGroup, type KanbanColumn as KanbanColumnType, KANBAN_CARD_DRAG_TYPE } from "@/ee/base/types/base.types";
 import { buildColumnFilter } from "@/ee/base/services/kanban-column-filter";
 import { formatKanbanCount } from "@/ee/base/services/format-kanban-count";
 import { useKanbanColumnAutoScroll } from "@/ee/base/hooks/use-kanban-autoscroll";
@@ -19,6 +19,7 @@ type KanbanColumnProps = {
   column: KanbanColumnType;
   viewFilter: FilterGroup | undefined;
   groupByPropertyId: string;
+  groupByProperty: IBaseProperty | undefined;
   canEdit: boolean;
   onOpenRow: (rowId: string) => void;
   onHide: (columnKey: string) => void;
@@ -33,6 +34,7 @@ export function KanbanColumn({
   column,
   viewFilter,
   groupByPropertyId,
+  groupByProperty,
   canEdit,
   onOpenRow,
   onHide,
@@ -139,6 +141,7 @@ export function KanbanColumn({
       <KanbanColumnHeader
         column={column}
         pageId={pageId}
+        property={groupByProperty}
         count={count}
         canEdit={canEdit}
         onHide={() => onHide(column.key)}

apps/client/src/ee/base/components/property/property-menu.tsx

@@ -53,6 +53,7 @@ type PropertyMenuContentProps = {
   onDirtyChange?: (dirty: boolean) => void;
   onEditFormula?: () => void;
   pageId: string;
+  initialPanel?: "main" | "options";
 };
 
 type MenuPanel =
@@ -96,9 +97,10 @@ export function PropertyMenuContent({
   onDirtyChange,
   onEditFormula,
   pageId,
+  initialPanel,
 }: PropertyMenuContentProps) {
   const { t } = useTranslation();
-  const [panel, setPanel] = useState<MenuPanel>("main");
+  const [panel, setPanel] = useState<MenuPanel>(initialPanel ?? "main");
   const [renameValue, setRenameValue] = useState(property.name);
   const renameInputRef = useRef<HTMLInputElement>(null);
   const [optionsDirty, setOptionsDirty] = useState(false);
@@ -117,12 +119,12 @@ export function PropertyMenuContent({
 
   useEffect(() => {
     if (opened) {
-      setPanel("main");
+      setPanel(initialPanel ?? "main");
       setRenameValue(property.name);
       setOptionsDirty(false);
       setPendingTargetType(null);
     }
-  }, [opened, property.name]);
+  }, [opened, property.name, initialPanel]);
 
   useEffect(() => {
     if (panel === "rename") {
@@ -463,7 +465,7 @@ export function PropertyMenuContent({
 
 PropertyMenuContent.displayName = "PropertyMenuContent";
 
-function MenuItem({
+export function MenuItem({
   icon,
   label,
   rightIcon,

apps/client/src/ee/base/hooks/use-kanban-columns.ts

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { IBase, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
+import { IBase, IBaseProperty, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
 
 export type KanbanGroup = KanbanColumn & { hidden: boolean };
 
@@ -8,6 +8,7 @@ export function useKanbanColumns(
   view: IBaseView | undefined,
 ): {
   groupByPropertyId: string | undefined;
+  groupByProperty: IBaseProperty | undefined;
   columns: KanbanColumn[];
   allGroups: KanbanGroup[];
   hasValidGroupBy: boolean;
@@ -18,7 +19,7 @@ export function useKanbanColumns(
     const groupable = prop && (prop.type === "select" || prop.type === "status");
 
     if (!groupable || !prop || !view) {
-      return { groupByPropertyId, columns: [], allGroups: [], hasValidGroupBy: false };
+      return { groupByPropertyId, groupByProperty: undefined, columns: [], allGroups: [], hasValidGroupBy: false };
     }
 
     const typeOptions = prop.typeOptions as SelectTypeOptions;
@@ -47,6 +48,6 @@ export function useKanbanColumns(
     });
     const columns: KanbanColumn[] = allGroups.filter((g) => !g.hidden);
 
-    return { groupByPropertyId, columns, allGroups, hasValidGroupBy: true };
+    return { groupByPropertyId, groupByProperty: prop, columns, allGroups, hasValidGroupBy: true };
   }, [base, view]);
 }

apps/client/src/ee/base/styles/kanban.module.css

@@ -76,6 +76,21 @@
   cursor: grabbing;
 }
 
+.columnTitleButton {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  padding: 2px 6px;
+  margin: -2px -6px;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.columnTitleButton:hover {
+  background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
+}
+
 .cardList {
   display: flex;
   flex-direction: column;

apps/client/src/ee/billing/pages/billing.tsx

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import BillingPlans from "@/ee/billing/components/billing-plans.tsx";
 import BillingTrial from "@/ee/billing/components/billing-trial.tsx";
@@ -9,6 +7,7 @@ import React from "react";
 import BillingDetails from "@/ee/billing/components/billing-details.tsx";
 import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Billing() {
   const { data: billing, isError: isBillingError } = useBillingQuery();
@@ -20,9 +19,7 @@ export default function Billing() {
 
   return (
     <>
-      <Helmet>
-        <title>Billing - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title="Billing" />
       <SettingsTitle title="Billing" />
 
       <BillingTrial />

apps/client/src/ee/licence/pages/license.tsx

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -9,6 +7,7 @@ import InstallationDetails from "@/ee/licence/components/installation-details.ts
 import OssDetails from "@/ee/licence/components/oss-details.tsx";
 import { useAtom } from "jotai/index";
 import { entitlementAtom } from "@/ee/entitlement/entitlement-atom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function License() {
   const [entitlements] = useAtom(entitlementAtom);
@@ -21,9 +20,7 @@ export default function License() {
 
   return (
     <>
-      <Helmet>
-        <title>License - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title="License" />
       <SettingsTitle title="License" />
 
       <ActivateLicenseForm />

apps/client/src/ee/page-verification/pages/verified-pages.tsx

@@ -1,17 +1,16 @@
 import { useState, useMemo } from "react";
 import { Group, MultiSelect, Select, Space, TextInput } from "@mantine/core";
 import { useDebouncedValue } from "@mantine/hooks";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSearch } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useVerificationListQuery } from "@/ee/page-verification/queries/page-verification-query";
 import { IVerificationListParams } from "@/ee/page-verification/types/page-verification.types";
 import VerificationListTable from "@/ee/page-verification/components/verification-list-table";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function VerifiedPages() {
   const { t } = useTranslation();
@@ -68,11 +67,7 @@ export default function VerifiedPages() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Verified pages")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Verified pages")} />
 
       <SettingsTitle title={t("Verified pages")} />
 

apps/client/src/ee/pages/cloud-login.tsx

@@ -1,18 +1,13 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { CloudLoginForm } from "@/ee/components/cloud-login-form.tsx";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function CloudLogin() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Login")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Login")} />
 
       <CloudLoginForm />
     </>

apps/client/src/ee/pages/create-workspace.tsx

@@ -1,14 +1,11 @@
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
-import { Helmet } from "react-helmet-async";
 import React from "react";
-import { getAppName } from "@/lib/config.ts";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function CreateWorkspace() {
   return (
     <>
-      <Helmet>
-        <title>Create Workspace - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title="Create Workspace" />
       <SetupWorkspaceForm />
     </>
   );

apps/client/src/ee/security/pages/security.tsx

@@ -1,5 +1,4 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName, isCloud } from "@/lib/config.ts";
+import { isCloud } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import {
   Alert,
@@ -37,6 +36,7 @@ import EnableScim from "@/ee/scim/components/enable-scim";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import Paginate from "@/components/common/paginate";
 import { IScimToken } from "@/ee/scim/types/scim-token.types";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 const SCIM_TOKEN_LIMIT = 5;
 
@@ -64,9 +64,7 @@ export default function Security() {
 
   return (
     <>
-      <Helmet>
-        <title>Security - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title="Security" />
       <SettingsTitle title={t("Security")} />
 
       <EnforceMfa />

apps/client/src/ee/template/components/readonly-template-editor.tsx

@@ -41,6 +41,7 @@ export default function ReadonlyTemplateEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
+        textDirection="auto"
         extensions={extensions}
         content={template.content}
       />

apps/client/src/ee/template/pages/template-editor.tsx

@@ -22,8 +22,6 @@ import { useTranslation } from "react-i18next";
 import { useDisclosure, useWindowEvent } from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
 import { Link, useParams } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config";
 import { useEditor, EditorContent } from "@tiptap/react";
 import { templateExtensions } from "@/features/editor/extensions/extensions";
 import {
@@ -44,6 +42,7 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
 
 import classes from "./template-editor.module.css";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function TemplateEditor() {
   const { t } = useTranslation();
@@ -88,6 +87,7 @@ export default function TemplateEditor() {
   const editor = useEditor({
     extensions: templateExtensions,
     content: "",
+    textDirection: "auto",
     editorProps: {
       scrollThreshold: 80,
       scrollMargin: 80,
@@ -247,11 +247,7 @@ export default function TemplateEditor() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Edit template")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Edit template")} />
 
       {editorToolbarEnabled && editor && (
         <FixedToolbar editor={editor} templateMode />

apps/client/src/ee/template/pages/template-list.tsx

@@ -13,11 +13,9 @@ import {
 } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { IconPlus } from "@tabler/icons-react";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { useDisclosure } from "@mantine/hooks";
-import { getAppName } from "@/lib/config";
 import {
   useGetTemplatesQuery,
   useDeleteTemplateMutation,
@@ -31,6 +29,7 @@ import useUserRole from "@/hooks/use-user-role";
 import CreateTemplateModal from "@/ee/template/components/create-template-modal";
 import { useAtomValue } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function TemplateList() {
   const { t } = useTranslation();
@@ -102,11 +101,7 @@ export default function TemplateList() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Templates")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Templates")} />
 
       <Container size="900" pt="xl">
         <Group justify="space-between" mb="xl">

apps/client/src/features/attachments/components/attachment-file-icon.tsx

@@ -0,0 +1,59 @@
+import { ThemeIcon } from "@mantine/core";
+import {
+  IconFile,
+  IconFileTypeCsv,
+  IconFileTypeDocx,
+  IconFileTypePdf,
+  IconFileTypePpt,
+  IconFileTypeXls,
+  IconFileZip,
+  IconMovie,
+  IconMusic,
+  IconPhoto,
+  type Icon,
+} from "@tabler/icons-react";
+
+const EXT_ICONS: Record<string, { icon: Icon; color: string }> = {
+  ".pdf": { icon: IconFileTypePdf, color: "red" },
+  ".doc": { icon: IconFileTypeDocx, color: "blue" },
+  ".docx": { icon: IconFileTypeDocx, color: "blue" },
+  ".xls": { icon: IconFileTypeXls, color: "teal" },
+  ".xlsx": { icon: IconFileTypeXls, color: "teal" },
+  ".csv": { icon: IconFileTypeCsv, color: "teal" },
+  ".ppt": { icon: IconFileTypePpt, color: "orange" },
+  ".pptx": { icon: IconFileTypePpt, color: "orange" },
+  ".zip": { icon: IconFileZip, color: "gray" },
+  ".rar": { icon: IconFileZip, color: "gray" },
+  ".7z": { icon: IconFileZip, color: "gray" },
+  ".tar": { icon: IconFileZip, color: "gray" },
+  ".gz": { icon: IconFileZip, color: "gray" },
+};
+
+const MIME_ICONS: Array<{ prefix: string; icon: Icon; color: string }> = [
+  { prefix: "image/", icon: IconPhoto, color: "grape" },
+  { prefix: "video/", icon: IconMovie, color: "violet" },
+  { prefix: "audio/", icon: IconMusic, color: "pink" },
+];
+
+interface AttachmentFileIconProps {
+  fileExt?: string;
+  mimeType?: string;
+}
+
+export function AttachmentFileIcon({
+  fileExt,
+  mimeType,
+}: AttachmentFileIconProps) {
+  const byExt = fileExt ? EXT_ICONS[fileExt.toLowerCase()] : undefined;
+  const byMime = mimeType
+    ? MIME_ICONS.find((entry) => mimeType.startsWith(entry.prefix))
+    : undefined;
+  const { icon: FileIcon, color } = byExt ??
+    byMime ?? { icon: IconFile, color: "gray" };
+
+  return (
+    <ThemeIcon variant="light" color={color} size={40} radius="md">
+      <FileIcon size={22} stroke={1.5} />
+    </ThemeIcon>
+  );
+}

apps/client/src/features/attachments/components/page-attachments-modal.tsx

@@ -0,0 +1,191 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  ActionIcon,
+  Anchor,
+  Center,
+  Group,
+  Loader,
+  Modal,
+  ScrollArea,
+  Text,
+  Tooltip,
+} from "@mantine/core";
+import { IconDownload } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { SearchInput } from "@/components/common/search-input.tsx";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import { usePageAttachmentsQuery } from "@/features/attachments/queries/attachment-query.ts";
+import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
+import { AttachmentFileIcon } from "@/features/attachments/components/attachment-file-icon.tsx";
+import { formatBytes } from "@/lib";
+import { getFileUrl } from "@/lib/config.ts";
+import { formattedDate } from "@/lib/time.ts";
+
+interface PageAttachmentsModalProps {
+  pageId: string;
+  open: boolean;
+  onClose: () => void;
+}
+
+export default function PageAttachmentsModal({
+  pageId,
+  open,
+  onClose,
+}: PageAttachmentsModalProps) {
+  const { t } = useTranslation();
+
+  return (
+    <Modal
+      opened={open}
+      onClose={onClose}
+      title={t("Attachments")}
+      size={800}
+      closeButtonProps={{ "aria-label": t("Close") }}
+    >
+      <PageAttachmentsList pageId={pageId} />
+    </Modal>
+  );
+}
+
+function PageAttachmentsList({ pageId }: { pageId: string }) {
+  const { t } = useTranslation();
+  const [search, setSearch] = useState("");
+  const {
+    data,
+    isLoading,
+    isError,
+    isFetching,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+  } = usePageAttachmentsQuery(pageId, search);
+
+  const attachments = useMemo(
+    () => data?.pages.flatMap((page) => page.items) ?? [],
+    [data],
+  );
+
+  const loadMoreRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const sentinel = loadMoreRef.current;
+    if (!sentinel || !hasNextPage) return;
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].isIntersecting && !isFetching) {
+          fetchNextPage();
+        }
+      },
+      { threshold: 0.1 },
+    );
+
+    observer.observe(sentinel);
+    return () => observer.disconnect();
+  }, [fetchNextPage, hasNextPage, isFetching]);
+
+  const handleSearch = useCallback((value: string) => setSearch(value), []);
+
+  return (
+    <>
+      <SearchInput
+        onSearch={handleSearch}
+        placeholder={t("Search attachments...")}
+      />
+
+      {isLoading ? (
+        <Center py="xl">
+          <Loader size="sm" />
+        </Center>
+      ) : isError ? (
+        <Center py="xl">
+          <Text size="sm" c="dimmed">
+            {t("Error loading attachments.")}
+          </Text>
+        </Center>
+      ) : attachments.length === 0 ? (
+        <Center py="xl">
+          <Text size="sm" c="dimmed">
+            {search
+              ? t("No results found")
+              : t("No attachments on this page yet.")}
+          </Text>
+        </Center>
+      ) : (
+        <ScrollArea.Autosize mah={480} type="scroll" scrollbarSize={5}>
+          {attachments.map((attachment) => (
+            <AttachmentRow key={attachment.id} attachment={attachment} />
+          ))}
+          {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
+          {isFetchingNextPage && (
+            <Center py="sm">
+              <Loader size="sm" />
+            </Center>
+          )}
+        </ScrollArea.Autosize>
+      )}
+    </>
+  );
+}
+
+function AttachmentRow({ attachment }: { attachment: IPageAttachment }) {
+  const { t } = useTranslation();
+  const fileUrl = getFileUrl(attachment.url);
+
+  return (
+    <Group wrap="nowrap" gap="md" py="sm" pr="xs">
+      <AttachmentFileIcon
+        fileExt={attachment.fileExt}
+        mimeType={attachment.mimeType}
+      />
+
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <Anchor
+          href={fileUrl}
+          target="_blank"
+          rel="noopener noreferrer"
+          size="sm"
+          fw={500}
+          c="inherit"
+          truncate="end"
+          style={{ display: "block" }}
+        >
+          {attachment.fileName}
+        </Anchor>
+        <Text size="xs" c="dimmed" mt={2} truncate="end">
+          {formatBytes(Number(attachment.fileSize))}
+          {" · "}
+          {formattedDate(new Date(attachment.createdAt))}
+        </Text>
+      </div>
+
+      {attachment.creator && (
+        <Tooltip
+          label={t("Uploaded by {{name}}", { name: attachment.creator.name })}
+          withArrow
+        >
+          <CustomAvatar
+            avatarUrl={attachment.creator.avatarUrl}
+            name={attachment.creator.name}
+            size="sm"
+          />
+        </Tooltip>
+      )}
+
+      <Tooltip label={t("Download attachment")} withArrow>
+        <ActionIcon
+          component="a"
+          href={fileUrl}
+          download={attachment.fileName}
+          target="_blank"
+          rel="noopener noreferrer"
+          variant="subtle"
+          color="gray"
+          aria-label={t("Download {{name}}", { name: attachment.fileName })}
+        >
+          <IconDownload size={18} />
+        </ActionIcon>
+      </Tooltip>
+    </Group>
+  );
+}

apps/client/src/features/attachments/queries/attachment-query.ts

@@ -0,0 +1,25 @@
+import {
+  InfiniteData,
+  keepPreviousData,
+  useInfiniteQuery,
+  UseInfiniteQueryResult,
+} from "@tanstack/react-query";
+import { getPageAttachments } from "@/features/attachments/services/attachment-service.ts";
+import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
+import { IPagination } from "@/lib/types.ts";
+
+export function usePageAttachmentsQuery(
+  pageId: string,
+  search?: string,
+): UseInfiniteQueryResult<InfiniteData<IPagination<IPageAttachment>, unknown>> {
+  return useInfiniteQuery({
+    queryKey: ["page-attachments", pageId, search],
+    queryFn: ({ pageParam }) =>
+      getPageAttachments(pageId, { cursor: pageParam, query: search }),
+    enabled: !!pageId,
+    gcTime: 0,
+    placeholderData: keepPreviousData,
+    initialPageParam: undefined,
+    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
+  });
+}

apps/client/src/features/attachments/services/attachment-service.ts

@@ -3,7 +3,17 @@ import loadImage from "blueimp-load-image";
 import {
   AvatarIconType,
   IAttachment,
+  IPageAttachment,
 } from "@/features/attachments/types/attachment.types.ts";
+import { IPagination, QueryParams } from "@/lib/types.ts";
+
+export async function getPageAttachments(
+  pageId: string,
+  params?: QueryParams,
+): Promise<IPagination<IPageAttachment>> {
+  const req = await api.post("/pages/attachments", { pageId, ...params });
+  return req.data;
+}
 
 async function compressAndResizeIcon(
   file: File,

apps/client/src/features/attachments/services/index.ts

@@ -1,4 +1,5 @@
 export {
+  getPageAttachments,
   uploadIcon,
   uploadUserAvatar,
   uploadSpaceIcon,

apps/client/src/features/attachments/types/attachment.types.ts

@@ -15,6 +15,15 @@ export interface IAttachment {
   deletedAt: string | null;
 }
 
+export interface IPageAttachment extends IAttachment {
+  url: string;
+  creator: {
+    id: string;
+    name: string;
+    avatarUrl: string | null;
+  } | null;
+}
+
 export enum AvatarIconType {
   AVATAR = "avatar",
   SPACE_ICON = "space-icon",

apps/client/src/features/comment/components/comment-editor.tsx

@@ -103,6 +103,7 @@ const CommentEditor = forwardRef(
       },
       content: defaultContent,
       editable,
+      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       autofocus: (autofocus && "end") || false,

apps/client/src/features/editor/collab-socket.ts

@@ -0,0 +1,46 @@
+import {
+  HocuspocusProviderWebsocket,
+  WebSocketStatus,
+} from "@hocuspocus/provider";
+import { getCollaborationUrl } from "@/lib/config.ts";
+
+const RELEASE_GRACE_MS = 5000;
+
+let socket: HocuspocusProviderWebsocket | null = null;
+let editorCount = 0;
+let releaseTimer: ReturnType<typeof setTimeout> | null = null;
+
+export function getCollabSocket(): HocuspocusProviderWebsocket {
+  if (!socket) {
+    socket = new HocuspocusProviderWebsocket({
+      url: getCollaborationUrl(),
+      autoConnect: false,
+    });
+  }
+  return socket;
+}
+
+export function acquireCollabSocket(): void {
+  editorCount++;
+  if (releaseTimer) {
+    clearTimeout(releaseTimer);
+    releaseTimer = null;
+  }
+  const collabSocket = getCollabSocket();
+  collabSocket.shouldConnect = true;
+  if (collabSocket.status === WebSocketStatus.Disconnected) {
+    collabSocket.connect();
+  }
+}
+
+export function releaseCollabSocket(): void {
+  editorCount--;
+  if (editorCount > 0) return;
+  if (releaseTimer) clearTimeout(releaseTimer);
+  releaseTimer = setTimeout(() => {
+    releaseTimer = null;
+    if (editorCount === 0) {
+      socket?.disconnect();
+    }
+  }, RELEASE_GRACE_MS);
+}

apps/client/src/features/editor/components/base-embed/insert-base-embed.ts

@@ -2,6 +2,8 @@ import type { Editor, Range } from "@tiptap/core";
 import { v7 as uuid7 } from "uuid";
 import { notifications } from "@mantine/notifications";
 import api from "@/lib/api-client";
+import i18n from "@/i18n.ts";
+import { getApiErrorMessage } from "@/lib/api-error";
 
 function findBaseEmbedPlaceholderPos(
   editor: Editor,
@@ -50,7 +52,7 @@ export async function insertBaseEmbedBlock(
         return true;
       })
       .run();
-  } catch {
+  } catch (err) {
     const pos = findBaseEmbedPlaceholderPos(editor, pendingKey);
     if (pos !== null) {
       editor
@@ -62,6 +64,9 @@ export async function insertBaseEmbedBlock(
         })
         .run();
     }
-    notifications.show({ message: "Failed to create base", color: "red" });
+    notifications.show({
+      message: getApiErrorMessage(err, i18n.t("Failed to create base")),
+      color: "red",
+    });
   }
 }

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.module.css

@@ -6,6 +6,7 @@
   z-index: 99;
   display: flex;
   align-items: center;
+  min-height: 45px;
   background: var(--mantine-color-body);
   border-bottom: 1px solid
     light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.tsx

@@ -31,8 +31,6 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
   const workspace = useAtomValue(workspaceAtom);
   const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;
 
-  if (!editor || !state) return null;
-
   return (
     <>
       <div
@@ -49,22 +47,26 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
               <div className={classes.divider} />
             </>
           )} */}
-          <BlockTypeGroup editor={editor} />
-          <div className={classes.divider} />
-          <InlineMarksGroup editor={editor} state={state} />
-          <div className={classes.divider} />
-          <ColorGroup editor={editor} />
-          <div className={classes.divider} />
-          <ListsGroup editor={editor} state={state} />
-          <div className={classes.divider} />
-          <AlignmentGroup editor={editor} />
-          <div className={classes.divider} />
-          <MediaGroup editor={editor} templateMode={templateMode} />
-          <div className={classes.divider} />
-          <QuickInsertsGroup editor={editor} />
-          <MoreInsertsGroup editor={editor} templateMode={templateMode} />
-          <div className={classes.divider} />
-          <HistoryGroup editor={editor} state={state} />
+          {editor && state && (
+            <>
+              <BlockTypeGroup editor={editor} />
+              <div className={classes.divider} />
+              <InlineMarksGroup editor={editor} state={state} />
+              <div className={classes.divider} />
+              <ColorGroup editor={editor} />
+              <div className={classes.divider} />
+              <ListsGroup editor={editor} state={state} />
+              <div className={classes.divider} />
+              <AlignmentGroup editor={editor} />
+              <div className={classes.divider} />
+              <MediaGroup editor={editor} templateMode={templateMode} />
+              <div className={classes.divider} />
+              <QuickInsertsGroup editor={editor} />
+              <MoreInsertsGroup editor={editor} templateMode={templateMode} />
+              <div className={classes.divider} />
+              <HistoryGroup editor={editor} state={state} />
+            </>
+          )}
         </div>
       </div>
       <div className={classes.spacer} aria-hidden />

apps/client/src/features/editor/components/fixed-toolbar/groups/more-inserts-group.tsx

@@ -1,6 +1,6 @@
 import { FC } from "react";
 import type { Editor } from "@tiptap/react";
-import { ActionIcon, Menu, Tooltip } from "@mantine/core";
+import { ActionIcon, Badge, Menu, Tooltip } from "@mantine/core";
 import {
   IconAppWindow,
   IconCalendar,
@@ -12,6 +12,7 @@ import {
   IconMathFunction,
   IconRotate2,
   IconSitemap,
+  IconSuperscript,
   IconTable,
   IconTag,
 } from "@tabler/icons-react";
@@ -32,6 +33,9 @@ import {
 } from "@/components/icons";
 import { useTranslation } from "react-i18next";
 import { insertBaseEmbedBlock } from "@/features/editor/components/base-embed/insert-base-embed";
+import { useHasFeature } from "@/ee/hooks/use-feature";
+import { Feature } from "@/ee/features";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 
 interface Props {
   editor: Editor;
@@ -40,6 +44,8 @@ interface Props {
 
 export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
   const { t, i18n } = useTranslation();
+  const hasBases = useHasFeature(Feature.BASES);
+  const upgradeLabel = useUpgradeLabel();
 
   const setEmbed = (provider: string) =>
     editor.chain().focus().setEmbed({ provider }).run();
@@ -106,20 +112,48 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
           </Menu.Item>
         )}
         {!templateMode && (
-          <Menu.Item
-            leftSection={<IconTable size={16} />}
-            onClick={() => insertBaseEmbedBlock(editor)}
-          >
-            {t("Base (Inline)")}
-          </Menu.Item>
+          <Tooltip label={upgradeLabel} disabled={hasBases} position="right">
+            <Menu.Item
+              leftSection={<IconTable size={16} />}
+              aria-disabled={!hasBases}
+              closeMenuOnClick={hasBases}
+              style={{ opacity: hasBases ? undefined : 0.7 }}
+              rightSection={
+                !hasBases && (
+                  <Badge size="xs" variant="light" color="gray">
+                    {t("Upgrade")}
+                  </Badge>
+                )
+              }
+              onClick={() => {
+                if (hasBases) insertBaseEmbedBlock(editor);
+              }}
+            >
+              {t("Base (Inline)")}
+            </Menu.Item>
+          </Tooltip>
         )}
         {!templateMode && (
-          <Menu.Item
-            leftSection={<IconLayoutKanban size={16} />}
-            onClick={() => insertBaseEmbedBlock(editor, { template: "kanban" })}
-          >
-            {t("Kanban")}
-          </Menu.Item>
+          <Tooltip label={upgradeLabel} disabled={hasBases} position="right">
+            <Menu.Item
+              leftSection={<IconLayoutKanban size={16} />}
+              aria-disabled={!hasBases}
+              closeMenuOnClick={hasBases}
+              style={{ opacity: hasBases ? undefined : 0.7 }}
+              rightSection={
+                !hasBases && (
+                  <Badge size="xs" variant="light" color="gray">
+                    {t("Upgrade")}
+                  </Badge>
+                )
+              }
+              onClick={() => {
+                if (hasBases) insertBaseEmbedBlock(editor, { template: "kanban" });
+              }}
+            >
+              {t("Kanban")}
+            </Menu.Item>
+          </Tooltip>
         )}
 
         <Menu.Divider />
@@ -237,6 +271,12 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
         >
           {t("Math block")}
         </Menu.Item>
+        <Menu.Item
+          leftSection={<IconSuperscript size={16} />}
+          onClick={() => editor.chain().focus().addFootnote().run()}
+        >
+          {t("Footnote")}
+        </Menu.Item>
       </Menu.Dropdown>
     </Menu>
   );

apps/client/src/features/editor/components/slash-menu/command-list.tsx

@@ -10,6 +10,7 @@ import {
   Paper,
   ScrollArea,
   Text,
+  Tooltip,
   UnstyledButton,
   VisuallyHidden,
 } from "@mantine/core";
@@ -18,6 +19,7 @@ import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 
 const CommandList = ({
   items,
@@ -37,11 +39,12 @@ const CommandList = ({
   const [selectionAnnouncement, setSelectionAnnouncement] = useState("");
 
   const hasBases = useHasFeature(Feature.BASES);
-  // Title must match the "Base (Inline)" item in menu-items.ts. Without the
-  // bases entitlement the item stays visible but disabled; an expired license
-  // the client can't detect falls through to a handled create failure.
+  const upgradeLabel = useUpgradeLabel();
+  // Without the bases entitlement the item stays visible but inert; an
+  // expired license the client can't detect falls through to a handled
+  // create failure.
   const isItemDisabled = (item: SlashMenuItemType) =>
-    !hasBases && item.title === "Base (Inline)";
+    !hasBases && item.requiresBases === true;
 
   const flatItems = useMemo(() => {
     return Object.values(items).flat();
@@ -152,18 +155,22 @@ const CommandList = ({
               const itemIndex = flatIndex;
               const disabled = isItemDisabled(item);
               return (
+              <Tooltip
+                key={itemIndex}
+                label={upgradeLabel}
+                disabled={!disabled}
+                position="right"
+              >
               <UnstyledButton
                 data-item-index={itemIndex}
-                key={itemIndex}
                 id={`slash-command-option-${itemIndex}`}
                 role="option"
                 aria-selected={itemIndex === selectedIndex}
                 aria-disabled={disabled}
-                disabled={disabled}
                 onClick={() => selectItem(itemIndex)}
                 className={clsx(classes.menuBtn, {
                   [classes.selectedItem]: itemIndex === selectedIndex,
-                  [classes.disabledItem]: disabled,
+                  [classes.gatedItem]: disabled,
                 })}
               >
                 <Group wrap="nowrap">
@@ -188,6 +195,7 @@ const CommandList = ({
                   )}
                 </Group>
               </UnstyledButton>
+              </Tooltip>
               );
             })}
           </div>

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -30,6 +30,7 @@ import {
   IconTag,
   IconMoodSmile,
   IconRotate2,
+  IconSuperscript,
 } from "@tabler/icons-react";
 import {
   CommandProps,
@@ -177,6 +178,16 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }: CommandProps) =>
         editor.chain().focus().deleteRange(range).setPageBreak().run(),
     },
+    {
+      title: "Footnote",
+      description: "Insert a footnote reference.",
+      searchTerms: ["footnote", "reference", "citation", "note"],
+      icon: IconSuperscript,
+      command: ({ editor, range }: CommandProps) => {
+        editor.chain().focus().deleteRange(range).run();
+        editor.commands.addFootnote();
+      },
+    },
     {
       title: "Image",
       description: "Upload any image from your device.",
@@ -366,6 +377,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       description: "Insert an inline base on this page",
       searchTerms: ["base", "database", "table", "grid", "spreadsheet"],
       icon: IconTable,
+      requiresBases: true,
       command: ({ editor, range }: CommandProps) => {
         insertBaseEmbedBlock(editor, { range });
       },
@@ -375,6 +387,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       description: "Insert a kanban board on this page",
       searchTerms: ["kanban", "board", "cards", "status", "task", "database"],
       icon: IconLayoutKanban,
+      requiresBases: true,
       command: ({ editor, range }: CommandProps) => {
         insertBaseEmbedBlock(editor, { range, template: "kanban" });
       },

apps/client/src/features/editor/components/slash-menu/slash-menu.module.css

@@ -26,7 +26,6 @@
   }
 }
 
-.disabledItem {
-  opacity: 0.45;
-  cursor: not-allowed;
+.gatedItem {
+  opacity: 0.7;
 }

apps/client/src/features/editor/components/slash-menu/types.ts

@@ -21,6 +21,7 @@ export type SlashMenuItemType = {
   searchTerms: string[];
   command: (props: CommandProps) => void;
   disable?: (editor: ReturnType<typeof useEditor>) => boolean;
+  requiresBases?: true;
 };
 
 export type SlashMenuGroupedItemsType = {

apps/client/src/features/editor/components/transclusion/transclusion-content.tsx

@@ -40,6 +40,7 @@ export default function TransclusionContent({ content }: Props) {
       <EditorProvider
         editable={false}
         immediatelyRender={true}
+        textDirection="auto"
         extensions={extensions}
         content={content as any}
       />

apps/client/src/features/editor/extensions/extensions.ts

@@ -1,9 +1,11 @@
 import { markInputRule } from "@tiptap/core";
 import { StarterKit } from "@tiptap/starter-kit";
+import { Document } from "@tiptap/extension-document";
 import { Code } from "@tiptap/extension-code";
 import { TextAlign } from "@tiptap/extension-text-align";
 import { TaskList, TaskItem } from "@tiptap/extension-list";
-import { Placeholder, CharacterCount, UndoRedo } from "@tiptap/extensions";
+import { CharacterCount, UndoRedo } from "@tiptap/extensions";
+import { Placeholder } from "@/features/editor/extensions/placeholder";
 import { Superscript } from "@tiptap/extension-superscript";
 import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
@@ -62,6 +64,9 @@ import {
   TransclusionReference,
   TableView,
   BaseEmbed as BaseEmbedNode,
+  Footnotes,
+  Footnote,
+  FootnoteReference,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -131,6 +136,7 @@ lowlight.register("scala", scala);
 // @ts-ignore
 export const mainExtensions = [
   StarterKit.configure({
+    document: false,
     heading: false,
     undoRedo: false,
     link: false,
@@ -142,6 +148,9 @@ export const mainExtensions = [
     codeBlock: false,
     code: false,
   }),
+  Document.extend({
+    content: "block+ footnotes?",
+  }),
   // Override TipTap's Code extension to fix the inline code input rule.
   // The upstream regex /(^|[^`])`([^`]+)`(?!`)$/ captures the character
   // before the opening backtick as part of the match, causing markInputRule
@@ -194,16 +203,19 @@ export const mainExtensions = [
         return i18n.t("Toggle title");
       }
       if (node.type.name === "paragraph") {
-        const $pos = editor.state.doc.resolve(pos);
-        const parentName = $pos.parent.type.name;
-        if (
-          parentName === "column" ||
-          parentName === "tableCell" ||
-          parentName === "tableHeader" ||
-          parentName === "callout" ||
-          parentName === "blockquote"
-        ) {
-          return i18n.t("Write...");
+        const doc = editor.state.doc;
+        if (pos >= 0 && pos <= doc.content.size) {
+          const parentName = doc.resolve(pos).parent.type.name;
+          if (
+            parentName === "column" ||
+            parentName === "tableCell" ||
+            parentName === "tableHeader" ||
+            parentName === "callout" ||
+            parentName === "blockquote" ||
+            parentName === "footnote"
+          ) {
+            return i18n.t("Write...");
+          }
         }
         return i18n.t('Write anything. Enter "/" for commands');
       }
@@ -414,6 +426,9 @@ export const mainExtensions = [
   }).configure(),
   Columns,
   Column,
+  Footnotes,
+  Footnote,
+  FootnoteReference,
   AutoJoiner.configure({
     elementsToJoin: [],
   }),

apps/client/src/features/editor/extensions/placeholder.ts

@@ -0,0 +1,64 @@
+import { isNodeEmpty } from "@tiptap/core";
+import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { Placeholder as TiptapPlaceholder } from "@tiptap/extensions";
+
+export const Placeholder = TiptapPlaceholder.extend({
+  addProseMirrorPlugins() {
+    const editor = this.editor;
+    const options = this.options;
+    const dataAttribute = `data-${options.dataAttribute || "placeholder"}`;
+
+    return [
+      new Plugin({
+        key: new PluginKey("docmostPlaceholder"),
+        props: {
+          decorations: (state) => {
+            if (options.showOnlyWhenEditable && !editor.isEditable) {
+              return null;
+            }
+
+            const { doc, selection } = state;
+            const { anchor } = selection;
+            const decorations: Decoration[] = [];
+            const isEmptyDoc = editor.isEmpty;
+
+            doc.descendants((node, pos) => {
+              if (!node.type.isTextblock) {
+                return options.includeChildren;
+              }
+
+              const hasAnchor = anchor >= pos && anchor <= pos + node.nodeSize;
+              const isEmpty = !node.isLeaf && isNodeEmpty(node);
+
+              if ((hasAnchor || !options.showOnlyCurrent) && isEmpty) {
+                const emptyNodeClass =
+                  typeof options.emptyNodeClass === "function"
+                    ? options.emptyNodeClass({ editor, node, pos, hasAnchor })
+                    : options.emptyNodeClass;
+                const classes = [emptyNodeClass];
+                if (isEmptyDoc) {
+                  classes.push(options.emptyEditorClass);
+                }
+
+                decorations.push(
+                  Decoration.node(pos, pos + node.nodeSize, {
+                    class: classes.join(" "),
+                    [dataAttribute]:
+                      typeof options.placeholder === "function"
+                        ? options.placeholder({ editor, node, pos, hasAnchor })
+                        : options.placeholder,
+                  }),
+                );
+              }
+
+              return options.includeChildren;
+            });
+
+            return DecorationSet.create(doc, decorations);
+          },
+        },
+      }),
+    ];
+  },
+});

apps/client/src/features/editor/hooks/use-collaboration-url.ts

@@ -1,7 +0,0 @@
-import { getCollaborationUrl } from "@/lib/config.ts";
-
-const useCollaborationURL = (): string => {
-  return getCollaborationUrl();
-};
-
-export default useCollaborationURL;

apps/client/src/features/editor/page-editor.tsx

@@ -2,20 +2,22 @@ import "@/features/editor/styles/index.css";
 import React, {
   useCallback,
   useEffect,
+  useLayoutEffect,
   useMemo,
   useRef,
   useState,
 } from "react";
 import { IndexeddbPersistence } from "y-indexeddb";
-import * as Y from "yjs";
 import {
-  HocuspocusProvider,
-  onStatusParameters,
   WebSocketStatus,
-  HocuspocusProviderWebsocket,
-  onSyncedParameters,
   onStatelessParameters,
 } from "@hocuspocus/provider";
+import {
+  HocuspocusProviderWebsocketComponent,
+  HocuspocusRoom,
+  useHocuspocusEvent,
+  useHocuspocusProvider,
+} from "@hocuspocus/provider-react";
 import {
   Editor,
   EditorContent,
@@ -28,7 +30,6 @@ import {
   mainExtensions,
 } from "@/features/editor/extensions/extensions";
 import { useAtom, useAtomValue } from "jotai";
-import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
   currentPageEditModeAtom,
@@ -76,6 +77,11 @@ import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
 import { useTranslation } from "react-i18next";
+import {
+  acquireCollabSocket,
+  getCollabSocket,
+  releaseCollabSocket,
+} from "@/features/editor/collab-socket";
 
 interface PageEditorProps {
   pageId: string;
@@ -91,7 +97,80 @@ export default function PageEditor({
   canComment,
 }: PageEditorProps) {
   const { t } = useTranslation();
-  const collaborationURL = useCollaborationUrl();
+  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
+  const { pageSlug } = useParams();
+  const slugId = extractPageSlugId(pageSlug);
+  const [socket] = useState(getCollabSocket);
+  const hasCollabToken = !!collabQuery?.token;
+
+  useEffect(() => {
+    if (!hasCollabToken) return;
+    acquireCollabSocket();
+    return () => releaseCollabSocket();
+  }, [hasCollabToken]);
+
+  const handleStateless = ({ payload }: onStatelessParameters) => {
+    try {
+      const message = JSON.parse(payload);
+      if (message?.type !== "page.updated" || !message.updatedAt) return;
+      const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+      if (pageData) {
+        queryClient.setQueryData(["pages", slugId], {
+          ...pageData,
+          updatedAt: message.updatedAt,
+          ...(message.lastUpdatedBy && {
+            lastUpdatedBy: message.lastUpdatedBy,
+          }),
+        });
+      }
+    } catch {
+      // ignore unrelated stateless messages
+    }
+  };
+
+  const handleAuthenticationFailed = () => {
+    const payload = jwtDecode(collabQuery?.token);
+    const now = Date.now().valueOf() / 1000;
+    const isTokenExpired = now >= payload.exp;
+    if (isTokenExpired) {
+      refetchCollabToken();
+    }
+  };
+
+  return (
+    <TransclusionLookupProvider>
+      {collabQuery?.token ? (
+        <HocuspocusProviderWebsocketComponent websocketProvider={socket}>
+          <HocuspocusRoom
+            name={`page.${pageId}`}
+            token={collabQuery.token}
+            flushDelay={500}
+            onStateless={handleStateless}
+            onAuthenticationFailed={handleAuthenticationFailed}
+          >
+            <CollabPageEditor
+              pageId={pageId}
+              editable={editable}
+              content={content}
+              canComment={canComment}
+            />
+          </HocuspocusRoom>
+        </HocuspocusProviderWebsocketComponent>
+      ) : (
+        <StaticPageEditor content={content} ariaLabel={t("Page content")} />
+      )}
+    </TransclusionLookupProvider>
+  );
+}
+
+function CollabPageEditor({
+  pageId,
+  editable,
+  content,
+  canComment,
+}: PageEditorProps) {
+  const { t } = useTranslation();
+  const provider = useHocuspocusProvider();
   const isComponentMounted = useRef(false);
   const editorRef = useRef<Editor | null>(null);
 
@@ -112,7 +191,6 @@ export default function PageEditor({
   );
   const [, setYjsSynced] = useAtom(yjsSyncedAtom);
   const menuContainerRef = useRef(null);
-  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
   const { isIdle, resetIdle } = useIdle(FIVE_MINUTES, { initialState: false });
   const documentState = useDocumentVisibility();
   const { pageSlug } = useParams();
@@ -123,95 +201,24 @@ export default function PageEditor({
     [isComponentMounted],
   );
   const { handleScrollTo } = useEditorScroll({ canScroll });
-  // Providers only created once per pageId
-  const providersRef = useRef<{
-    local: IndexeddbPersistence;
-    remote: HocuspocusProvider;
-    socket: HocuspocusProviderWebsocket;
-  } | null>(null);
-  const [providersReady, setProvidersReady] = useState(false);
 
   useEffect(() => {
-    if (!providersRef.current) {
-      const documentName = `page.${pageId}`;
-      const ydoc = new Y.Doc();
-      const local = new IndexeddbPersistence(documentName, ydoc);
-      const socket = new HocuspocusProviderWebsocket({
-        url: collaborationURL,
-      });
-      const onLocalSyncedHandler = () => {
-        setIsLocalSynced(true);
-      };
-      const onStatusHandler = (event: onStatusParameters) => {
-        setYjsConnectionStatus(event.status);
-      };
-      const onSyncedHandler = (event: onSyncedParameters) => {
-        setIsRemoteSynced(event.state);
-      };
-      const onStatelessHandler = ({ payload }: onStatelessParameters) => {
-        try {
-          const message = JSON.parse(payload);
-          if (message?.type !== "page.updated" || !message.updatedAt) return;
-          const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-          if (pageData) {
-            queryClient.setQueryData(["pages", slugId], {
-              ...pageData,
-              updatedAt: message.updatedAt,
-              ...(message.lastUpdatedBy && {
-                lastUpdatedBy: message.lastUpdatedBy,
-              }),
-            });
-          }
-        } catch {
-          // ignore unrelated stateless messages
-        }
-      };
-      const onAuthenticationFailedHandler = () => {
-        const payload = jwtDecode(collabQuery?.token);
-        const now = Date.now().valueOf() / 1000;
-        const isTokenExpired = now >= payload.exp;
-        if (isTokenExpired) {
-          refetchCollabToken().then((result) => {
-            if (result.data?.token) {
-              socket.disconnect();
-              setTimeout(() => {
-                remote.configuration.token = result.data.token;
-                socket.connect();
-              }, 100);
-            }
-          });
-        }
-      };
-      const remote = new HocuspocusProvider({
-        websocketProvider: socket,
-        name: documentName,
-        document: ydoc,
-        token: collabQuery?.token,
-        onAuthenticationFailed: onAuthenticationFailedHandler,
-        onStatus: onStatusHandler,
-        onSynced: onSyncedHandler,
-        onStateless: onStatelessHandler,
-      });
-
-      local.on("synced", onLocalSyncedHandler);
-      providersRef.current = { socket, local, remote };
-      setProvidersReady(true);
-    } else {
-      setProvidersReady(true);
-    }
-    // Only destroy on final unmount
+    const local = new IndexeddbPersistence(
+      provider.configuration.name,
+      provider.document,
+    );
+    local.on("synced", () => setIsLocalSynced(true));
     return () => {
-      providersRef.current?.socket.destroy();
-      providersRef.current?.remote.destroy();
-      providersRef.current?.local.destroy();
-      providersRef.current = null;
+      local.destroy();
     };
-  }, [pageId]);
+  }, [provider]);
+
+  useHocuspocusEvent("synced", ({ state }) => setIsRemoteSynced(state));
+  useHocuspocusEvent("status", ({ status }) => setYjsConnectionStatus(status));
 
   // Only connect/disconnect on tab/idle, not destroy
   useEffect(() => {
-    if (!providersReady || !providersRef.current) return;
-    const socket = providersRef.current.socket;
+    const socket = provider.configuration.websocketProvider;
 
     if (
       isIdle &&
@@ -228,28 +235,21 @@ export default function PageEditor({
       resetIdle();
       socket.connect();
     }
-  }, [isIdle, documentState, providersReady, resetIdle]);
-
-  // Attach here, to make sure the connection gets properly established
-  providersRef.current?.remote.attach();
+  }, [isIdle, documentState, provider, resetIdle]);
 
   const extensions = useMemo(() => {
-    if (!providersReady || !providersRef.current || !currentUser?.user) {
+    if (!currentUser?.user) {
       return mainExtensions;
     }
 
-    const remoteProvider = providersRef.current.remote;
-
-    return [
-      ...mainExtensions,
-      ...collabExtensions(remoteProvider, currentUser?.user),
-    ];
-  }, [providersReady, currentUser?.user]);
+    return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
+  }, [provider, currentUser?.user]);
 
   const editor = useEditor(
     {
       extensions,
       editable,
+      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       editorProps: {
@@ -326,6 +326,16 @@ export default function PageEditor({
     [pageId, editable, extensions],
   );
 
+  useLayoutEffect(() => {
+    if (editor && !editor.isDestroyed) {
+      // @ts-ignore
+      setEditor(editor);
+      // @ts-ignore
+      editor.storage.pageId = pageId;
+      editorRef.current = editor;
+    }
+  }, [editor, pageId, setEditor]);
+
   const editorIsEditable = useEditorState({
     editor,
     selector: (ctx) => {
@@ -416,65 +426,73 @@ export default function PageEditor({
     }
   }, [yjsConnectionStatus, isSynced]);
 
+  if (showStatic) {
+    return <StaticPageEditor content={content} ariaLabel={t("Page content")} />;
+  }
+
   return (
-    <TransclusionLookupProvider>
-      {showStatic ? (
-        <EditorProvider
-          editable={false}
-          immediatelyRender={true}
-          extensions={mainExtensions}
-          content={content}
-          editorProps={{
-            attributes: {
-              "aria-label": t("Page content"),
-            },
-          }}
-        />
-      ) : (
-        <div className="editor-container" style={{ position: "relative" }}>
-          <div ref={menuContainerRef}>
-            <EditorContent editor={editor} />
+    <div className="editor-container" style={{ position: "relative" }}>
+      <div ref={menuContainerRef}>
+        <EditorContent editor={editor} />
 
-            {editor && (
-              <SearchAndReplaceDialog editor={editor} editable={editable} />
-            )}
+        {editor && (
+          <SearchAndReplaceDialog editor={editor} editable={editable} />
+        )}
 
-            {editor && editorIsEditable && (
-              <div>
-                <EditorAiMenu editor={editor} />
-                <EditorLinkMenu editor={editor} />
-                <EditorBubbleMenu editor={editor} />
-                <TableMenu editor={editor} />
-                <TableHandlesLayer editor={editor} />
-                <ImageMenu editor={editor} />
-                <VideoMenu editor={editor} />
-                <PdfMenu editor={editor} />
-                <CalloutMenu editor={editor} />
-                <SubpagesMenu editor={editor} />
-                <ExcalidrawMenu editor={editor} />
-                <DrawioMenu editor={editor} />
-                <ColumnsMenu editor={editor} />
-              </div>
-            )}
-            {editor &&
-              !editorIsEditable &&
-              (editable || canComment) &&
-              providersRef.current && <ReadonlyBubbleMenu editor={editor} />}
-            {showCommentPopup && (
-              <CommentDialog editor={editor} pageId={pageId} />
-            )}
-            {showReadOnlyCommentPopup && (
-              <CommentDialog editor={editor} pageId={pageId} readOnly />
-            )}
+        {editor && editorIsEditable && (
+          <div>
+            <EditorAiMenu editor={editor} />
+            <EditorLinkMenu editor={editor} />
+            <EditorBubbleMenu editor={editor} />
+            <TableMenu editor={editor} />
+            <TableHandlesLayer editor={editor} />
+            <ImageMenu editor={editor} />
+            <VideoMenu editor={editor} />
+            <PdfMenu editor={editor} />
+            <CalloutMenu editor={editor} />
+            <SubpagesMenu editor={editor} />
+            <ExcalidrawMenu editor={editor} />
+            <DrawioMenu editor={editor} />
+            <ColumnsMenu editor={editor} />
           </div>
-          <div
-            onClick={() => {
-              if (editor && !editor.isDestroyed) editor.commands.focus("end");
-            }}
-            style={{ paddingBottom: "20vh" }}
-          ></div>
-        </div>
-      )}
-    </TransclusionLookupProvider>
+        )}
+        {editor && !editorIsEditable && (editable || canComment) && (
+          <ReadonlyBubbleMenu editor={editor} />
+        )}
+        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
+        {showReadOnlyCommentPopup && (
+          <CommentDialog editor={editor} pageId={pageId} readOnly />
+        )}
+      </div>
+      <div
+        onClick={() => {
+          if (editor && !editor.isDestroyed) editor.commands.focus("end");
+        }}
+        style={{ paddingBottom: "20vh" }}
+      ></div>
+    </div>
+  );
+}
+
+function StaticPageEditor({
+  content,
+  ariaLabel,
+}: {
+  content: any;
+  ariaLabel: string;
+}) {
+  return (
+    <EditorProvider
+      editable={false}
+      immediatelyRender={true}
+      textDirection="auto"
+      extensions={mainExtensions}
+      content={content}
+      editorProps={{
+        attributes: {
+          "aria-label": ariaLabel,
+        },
+      }}
+    />
   );
 }

apps/client/src/features/editor/readonly-page-editor.tsx

@@ -85,6 +85,7 @@ export default function ReadonlyPageEditor({
         <EditorProvider
           editable={false}
           immediatelyRender={true}
+          textDirection="auto"
           extensions={titleExtensions}
           content={title}
         ></EditorProvider>
@@ -93,6 +94,7 @@ export default function ReadonlyPageEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
+        textDirection="auto"
         extensions={extensions}
         content={content}
         onCreate={({ editor }) => {

apps/client/src/features/editor/styles/footnotes.css

@@ -0,0 +1,26 @@
+.ProseMirror sup a.footnote-ref {
+  color: var(--mantine-primary-color-filled);
+  text-decoration: none;
+  cursor: pointer;
+  font-weight: 600;
+}
+
+.ProseMirror sup:has(a.footnote-ref) {
+  padding: 0 1px;
+}
+
+.ProseMirror ol.footnotes {
+  margin-top: 2rem;
+  padding-top: 0.75rem;
+  font-size: 0.875rem;
+  color: var(--mantine-color-dimmed);
+  list-style-type: decimal;
+}
+
+.ProseMirror ol.footnotes:has(li) {
+  border-top: 1px solid var(--mantine-color-default-border);
+}
+
+.ProseMirror ol.footnotes li p {
+  margin: 0.15rem 0;
+}

apps/client/src/features/editor/styles/index.css

@@ -18,3 +18,4 @@
 @import "./columns.css";
 @import "./status.css";
 @import "./base-embed.css";
+@import "./footnotes.css";

apps/client/src/features/editor/styles/table.css

@@ -54,7 +54,7 @@
         var(--mantine-color-dark-5)
       );
       font-weight: bold;
-      text-align: left;
+      text-align: start;
     }
 
     .column-resize-handle {

apps/client/src/features/editor/title-editor.tsx

@@ -86,6 +86,7 @@ export function TitleEditor({
     },
     editable: editable,
     content: title,
+    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     editorProps: {

apps/client/src/features/label/queries/label-query.ts

@@ -39,6 +39,7 @@ export function useWorkspaceLabelsQuery(query: string, enabled: boolean) {
     queryFn: () => getWorkspaceLabels({ type: "page", query, limit: 50 }),
     enabled,
     staleTime: 30 * 1000,
+    placeholderData: keepPreviousData
   });
 }
 

apps/client/src/features/page-history/atoms/history-atoms.ts

@@ -6,4 +6,13 @@ export const activeHistoryPrevIdAtom = atom<string>("");
 export const highlightChangesAtom = atom<boolean>(true);
 
 export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(null);
+export const diffCountsAtom = atom<DiffCounts | null>(
+  null as DiffCounts | null,
+);
+
+export type ComparePair = { newerId: string; olderId: string };
+export const compareModeAtom = atom<boolean>(false);
+export const compareSelectionAtom = atom<string[]>([]);
+export const comparePairAtom = atom<ComparePair | null>(
+  null as ComparePair | null,
+);

apps/client/src/features/page-history/components/css/history.module.css

@@ -1,7 +1,7 @@
 .history {
-  display: block;
+  display: flex;
+  align-items: center;
   width: 100%;
-  padding: var(--mantine-spacing-md);
   color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
 
   @mixin hover {
@@ -12,6 +12,28 @@
   }
 }
 
+.historyButton {
+  flex: 1;
+  min-width: 0;
+  color: inherit;
+}
+
+.compareCheckbox {
+  padding-left: var(--mantine-spacing-xs);
+}
+
+.itemMenu {
+  opacity: 0;
+  margin-right: var(--mantine-spacing-xs);
+}
+
+.history:hover .itemMenu,
+.history:focus-within .itemMenu,
+.history.active .itemMenu,
+.itemMenu[aria-expanded="true"] {
+  opacity: 1;
+}
+
 .historyEditor {
   :global(.ProseMirror) {
     padding: 0 !important;
@@ -77,3 +99,8 @@
   flex: 1;
   padding: rem(16px) rem(40px);
 }
+
+.compareBanner {
+  border-bottom: rem(1px) solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
+}

apps/client/src/features/page-history/components/history-editor.tsx

@@ -31,6 +31,7 @@ export function HistoryEditor({
   const editor = useEditor({
     extensions: mainExtensions,
     editable: false,
+    textDirection: "auto",
   });
 
   useEffect(() => {
@@ -170,7 +171,6 @@ export function HistoryEditor({
     }
 
     const total = addedCount + deletedCount;
-    // @ts-ignore
     setDiffCounts({ added: addedCount, deleted: deletedCount, total });
 
     editor.setOptions({

apps/client/src/features/page-history/components/history-item.tsx

@@ -1,10 +1,21 @@
-import { Text, Group, UnstyledButton, Avatar, Tooltip } from "@mantine/core";
+import {
+  Text,
+  Group,
+  UnstyledButton,
+  Avatar,
+  Tooltip,
+  ActionIcon,
+  Checkbox,
+  Menu,
+} from "@mantine/core";
+import { IconDots } from "@tabler/icons-react";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
 import classes from "./css/history.module.css";
 import clsx from "clsx";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { memo, useCallback } from "react";
+import { useTranslation } from "react-i18next";
 
 const MAX_VISIBLE_AVATARS = 5;
 
@@ -15,6 +26,13 @@ interface HistoryItemProps {
   onHover?: (id: string, index: number) => void;
   onHoverEnd?: () => void;
   isActive: boolean;
+  compareMode: boolean;
+  isChecked: boolean;
+  isCheckboxDisabled: boolean;
+  canCompare: boolean;
+  onToggleCompare: (id: string) => void;
+  onStartCompare: (id: string) => void;
+  onRestore?: (id: string, index: number) => void;
 }
 
 const HistoryItem = memo(function HistoryItem({
@@ -24,10 +42,24 @@ const HistoryItem = memo(function HistoryItem({
   onHover,
   onHoverEnd,
   isActive,
+  compareMode,
+  isChecked,
+  isCheckboxDisabled,
+  canCompare,
+  onToggleCompare,
+  onStartCompare,
+  onRestore,
 }: HistoryItemProps) {
+  const { t } = useTranslation();
+  const date = formattedDate(new Date(historyItem.createdAt));
+
   const handleClick = useCallback(() => {
-    onSelect(historyItem.id, index);
-  }, [onSelect, historyItem.id, index]);
+    if (compareMode) {
+      onToggleCompare(historyItem.id);
+    } else {
+      onSelect(historyItem.id, index);
+    }
+  }, [compareMode, onToggleCompare, onSelect, historyItem.id, index]);
 
   const handleMouseEnter = useCallback(() => {
     onHover?.(historyItem.id, index);
@@ -37,63 +69,115 @@ const HistoryItem = memo(function HistoryItem({
   const hasContributors = contributors && contributors.length > 0;
 
   return (
-    <UnstyledButton
-      p="xs"
-      onClick={handleClick}
+    <div
+      className={clsx(classes.history, { [classes.active]: isActive })}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={onHoverEnd}
-      className={clsx(classes.history, { [classes.active]: isActive })}
     >
-      <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>
+      {compareMode && (
+        <Checkbox
+          size="xs"
+          className={classes.compareCheckbox}
+          checked={isChecked}
+          disabled={isCheckboxDisabled}
+          onChange={() => onToggleCompare(historyItem.id)}
+          aria-label={t("Select version from {{date}}", { date })}
+        />
+      )}
 
-      <Group gap={6} wrap="nowrap" mt={4}>
-        {hasContributors ? (
-          <>
-            <Tooltip.Group openDelay={300} closeDelay={100}>
-              <Avatar.Group spacing={8}>
-                {contributors.slice(0, MAX_VISIBLE_AVATARS).map((contributor) => (
-                  <Tooltip key={contributor.id} label={contributor.name} withArrow>
-                    <CustomAvatar
-                      size="sm"
-                      avatarUrl={contributor.avatarUrl}
-                      name={contributor.name}
-                    />
-                  </Tooltip>
-                ))}
-                {contributors.length > MAX_VISIBLE_AVATARS && (
-                  <Tooltip
-                    withArrow
-                    label={contributors.slice(MAX_VISIBLE_AVATARS).map((c) => (
-                      <div key={c.id}>{c.name}</div>
+      <UnstyledButton
+        p="xs"
+        onClick={handleClick}
+        className={classes.historyButton}
+      >
+        <Text size="sm">{date}</Text>
+
+        <Group gap={6} wrap="nowrap" mt={4}>
+          {hasContributors ? (
+            <>
+              <Tooltip.Group openDelay={300} closeDelay={100}>
+                <Avatar.Group spacing={8}>
+                  {contributors
+                    .slice(0, MAX_VISIBLE_AVATARS)
+                    .map((contributor) => (
+                      <Tooltip
+                        key={contributor.id}
+                        label={contributor.name}
+                        withArrow
+                      >
+                        <CustomAvatar
+                          size="sm"
+                          avatarUrl={contributor.avatarUrl}
+                          name={contributor.name}
+                        />
+                      </Tooltip>
                     ))}
-                  >
-                    <Avatar size="sm" color="gray">
-                      +{contributors.length - MAX_VISIBLE_AVATARS}
-                    </Avatar>
-                  </Tooltip>
-                )}
-              </Avatar.Group>
-            </Tooltip.Group>
-            {contributors.length === 1 && (
+                  {contributors.length > MAX_VISIBLE_AVATARS && (
+                    <Tooltip
+                      withArrow
+                      label={contributors
+                        .slice(MAX_VISIBLE_AVATARS)
+                        .map((c) => (
+                          <div key={c.id}>{c.name}</div>
+                        ))}
+                    >
+                      <Avatar size="sm" color="gray">
+                        +{contributors.length - MAX_VISIBLE_AVATARS}
+                      </Avatar>
+                    </Tooltip>
+                  )}
+                </Avatar.Group>
+              </Tooltip.Group>
+              {contributors.length === 1 && (
+                <Text size="sm" c="dimmed" lineClamp={1}>
+                  {contributors[0].name}
+                </Text>
+              )}
+            </>
+          ) : (
+            <>
+              <CustomAvatar
+                size="sm"
+                avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
+                name={historyItem.lastUpdatedBy?.name}
+              />
               <Text size="sm" c="dimmed" lineClamp={1}>
-                {contributors[0].name}
+                {historyItem.lastUpdatedBy?.name}
               </Text>
+            </>
+          )}
+        </Group>
+      </UnstyledButton>
+
+      {!compareMode && (
+        <Menu shadow="md" width={180} position="bottom-end">
+          <Menu.Target>
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              className={classes.itemMenu}
+              aria-label={t("Version actions for {{date}}", { date })}
+              onClick={(e) => e.stopPropagation()}
+            >
+              <IconDots size={18} />
+            </ActionIcon>
+          </Menu.Target>
+          <Menu.Dropdown>
+            <Menu.Item
+              disabled={!canCompare}
+              onClick={() => onStartCompare(historyItem.id)}
+            >
+              {t("Compare")}
+            </Menu.Item>
+            {onRestore && (
+              <Menu.Item onClick={() => onRestore(historyItem.id, index)}>
+                {t("Restore")}
+              </Menu.Item>
             )}
-          </>
-        ) : (
-          <>
-            <CustomAvatar
-              size="sm"
-              avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
-              name={historyItem.lastUpdatedBy?.name}
-            />
-            <Text size="sm" c="dimmed" lineClamp={1}>
-              {historyItem.lastUpdatedBy?.name}
-            </Text>
-          </>
-        )}
-      </Group>
-    </UnstyledButton>
+          </Menu.Dropdown>
+        </Menu>
+      )}
+    </div>
   );
 });
 

apps/client/src/features/page-history/components/history-list.tsx

@@ -6,8 +6,12 @@ import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
+  compareModeAtom,
+  comparePairAtom,
+  compareSelectionAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
+import { resolveComparePair } from "@/features/page-history/utils/resolve-compare-pair";
 import { useAtom, useSetAtom } from "jotai";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
@@ -32,6 +36,9 @@ function HistoryList({ pageId }: Props) {
   const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
+  const [compareMode, setCompareMode] = useAtom(compareModeAtom);
+  const [compareSelection, setCompareSelection] = useAtom(compareSelectionAtom);
+  const setComparePair = useSetAtom(comparePairAtom);
 
   const {
     data: pageHistoryData,
@@ -79,10 +86,58 @@ function HistoryList({ pageId }: Props) {
 
   const handleSelect = useCallback(
     (id: string, index: number) => {
+      setComparePair(null);
       setActiveHistoryId(id);
       setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
     },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
+    [historyItems, setActiveHistoryId, setActiveHistoryPrevId, setComparePair],
+  );
+
+  const handleToggleCompare = useCallback(
+    (id: string) => {
+      setCompareSelection((prev) => {
+        if (prev.includes(id)) return prev.filter((item) => item !== id);
+        if (prev.length >= 2) return prev;
+        return [...prev, id];
+      });
+    },
+    [setCompareSelection],
+  );
+
+  const handleStartCompare = useCallback(
+    (id: string) => {
+      setComparePair(null);
+      setCompareMode(true);
+      setCompareSelection([id]);
+    },
+    [setComparePair, setCompareMode, setCompareSelection],
+  );
+
+  const handleCancelCompare = useCallback(() => {
+    setCompareMode(false);
+    setCompareSelection([]);
+  }, [setCompareMode, setCompareSelection]);
+
+  const handleConfirmCompare = useCallback(() => {
+    const pair = resolveComparePair(historyItems, compareSelection);
+    if (!pair) return;
+    setComparePair(pair);
+    setCompareMode(false);
+    setCompareSelection([]);
+  }, [
+    historyItems,
+    compareSelection,
+    setComparePair,
+    setCompareMode,
+    setCompareSelection,
+  ]);
+
+  const handleRestoreItem = useCallback(
+    (id: string, index: number) => {
+      handleSelect(id, index);
+      confirmRestore(id);
+    },
+    [handleSelect, confirmRestore],
   );
 
   useEffect(() => {
@@ -138,6 +193,16 @@ function HistoryList({ pageId }: Props) {
             onHover={handleHover}
             onHoverEnd={clearPrefetchTimeout}
             isActive={historyItem.id === activeHistoryId}
+            compareMode={compareMode}
+            isChecked={compareSelection.includes(historyItem.id)}
+            isCheckboxDisabled={
+              !compareSelection.includes(historyItem.id) &&
+              compareSelection.length >= 2
+            }
+            canCompare={historyItems.length >= 2}
+            onToggleCompare={handleToggleCompare}
+            onStartCompare={handleStartCompare}
+            onRestore={canRestore ? handleRestoreItem : undefined}
           />
         ))}
         {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
@@ -148,22 +213,44 @@ function HistoryList({ pageId }: Props) {
         )}
       </ScrollArea>
 
-      {canRestore && (
+      {compareMode ? (
         <>
           <Divider />
           <Group p="xs" wrap="nowrap">
             <Button
               variant="default"
               size="compact-md"
-              onClick={() => setHistoryModalOpen(false)}
+              onClick={handleCancelCompare}
             >
               {t("Cancel")}
             </Button>
-            <Button size="compact-md" onClick={confirmRestore}>
-              {t("Restore")}
+            <Button
+              size="compact-md"
+              disabled={compareSelection.length !== 2}
+              onClick={handleConfirmCompare}
+            >
+              {t("Compare")}
             </Button>
           </Group>
         </>
+      ) : (
+        canRestore && (
+          <>
+            <Divider />
+            <Group p="xs" wrap="nowrap">
+              <Button
+                variant="default"
+                size="compact-md"
+                onClick={() => setHistoryModalOpen(false)}
+              >
+                {t("Cancel")}
+              </Button>
+              <Button size="compact-md" onClick={() => confirmRestore()}>
+                {t("Restore")}
+              </Button>
+            </Group>
+          </>
+        )
       )}
     </div>
   );

apps/client/src/features/page-history/components/history-modal-body.tsx

@@ -1,5 +1,6 @@
 import {
   ActionIcon,
+  CloseButton,
   Group,
   Paper,
   ScrollArea,
@@ -12,17 +13,20 @@ import { useAtom, useAtomValue } from "jotai";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
+  comparePairAtom,
   diffCountsAtom,
   highlightChangesAtom,
 } from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useRef } from "react";
+import { useMemo, useRef } from "react";
 import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import {
   useDiffNavigation,
   useHistoryReset,
 } from "@/features/page-history/hooks";
+import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
+import { formattedDate } from "@/lib/time";
 
 interface Props {
   pageId: string;
@@ -36,6 +40,28 @@ export default function HistoryModalBody({ pageId }: Props) {
   const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
   const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
   const diffCounts = useAtomValue(diffCountsAtom);
+  const [comparePair, setComparePair] = useAtom(comparePairAtom);
+
+  const { data: pageHistoryData } = usePageHistoryListQuery(pageId);
+  const historyItems = useMemo(
+    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
+    [pageHistoryData],
+  );
+
+  const compareLabel = useMemo(() => {
+    if (!comparePair) return null;
+    const newerItem = historyItems.find(
+      (item) => item.id === comparePair.newerId,
+    );
+    const olderItem = historyItems.find(
+      (item) => item.id === comparePair.olderId,
+    );
+    if (!newerItem || !olderItem) return null;
+    return t("Comparing {{newer}} and {{older}}", {
+      newer: formattedDate(new Date(newerItem.createdAt)),
+      older: formattedDate(new Date(olderItem.createdAt)),
+    });
+  }, [comparePair, historyItems, t]);
 
   useHistoryReset(pageId);
   const { currentChangeIndex, handlePrevChange, handleNextChange } =
@@ -50,6 +76,25 @@ export default function HistoryModalBody({ pageId }: Props) {
       </nav>
 
       <div style={{ position: "relative", flex: 1 }}>
+        {comparePair && (
+          <Group
+            justify="space-between"
+            wrap="nowrap"
+            px="md"
+            py={4}
+            className={classes.compareBanner}
+          >
+            <Text size="sm" fw={500} lineClamp={1}>
+              {compareLabel ?? t("Compare versions")}
+            </Text>
+            <CloseButton
+              size="sm"
+              aria-label={t("Exit compare")}
+              onClick={() => setComparePair(null)}
+            />
+          </Group>
+        )}
+
         <ScrollArea
           h={650}
           w="100%"
@@ -57,11 +102,18 @@ export default function HistoryModalBody({ pageId }: Props) {
           viewportRef={scrollViewportRef}
         >
           <div className={classes.sidebarRightSection}>
-            {activeHistoryId && <HistoryView />}
+            {comparePair ? (
+              <HistoryView
+                historyId={comparePair.newerId}
+                prevHistoryId={comparePair.olderId}
+              />
+            ) : (
+              activeHistoryId && <HistoryView />
+            )}
           </div>
         </ScrollArea>
 
-        {activeHistoryId && activeHistoryPrevId && (
+        {(comparePair || (activeHistoryId && activeHistoryPrevId)) && (
           <Paper
             shadow="md"
             radius="xl"

apps/client/src/features/page-history/components/history-modal-mobile.tsx

@@ -166,7 +166,7 @@ export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
           <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
             {t("Cancel")}
           </Button>
-          <Button onClick={confirmRestore}>{t("Restore")}</Button>
+          <Button onClick={() => confirmRestore()}>{t("Restore")}</Button>
         </Group>
       )}
 

apps/client/src/features/page-history/components/history-view.tsx

@@ -7,21 +7,29 @@ import {
   activeHistoryPrevIdAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
-function HistoryView() {
+interface Props {
+  historyId?: string;
+  prevHistoryId?: string;
+}
+
+function HistoryView({ historyId, prevHistoryId }: Props) {
   const { t } = useTranslation();
-  const historyId = useAtomValue(activeHistoryIdAtom);
-  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);
+  const activeId = useAtomValue(activeHistoryIdAtom);
+  const activePrevId = useAtomValue(activeHistoryPrevIdAtom);
+
+  const resolvedId = historyId ?? activeId;
+  const resolvedPrevId = prevHistoryId ?? activePrevId;
 
   const {
     data,
     isLoading: isLoadingCurrent,
     isError: isErrorCurrent,
-  } = usePageHistoryQuery(historyId);
+  } = usePageHistoryQuery(resolvedId);
   const {
     data: prevData,
     isLoading: isLoadingPrev,
     isError: isErrorPrev,
-  } = usePageHistoryQuery(prevHistoryId);
+  } = usePageHistoryQuery(resolvedPrevId);
 
   if (isLoadingCurrent || isLoadingPrev) {
     return <></>;

apps/client/src/features/page-history/hooks/use-history-reset.ts

@@ -3,22 +3,45 @@ import { useEffect } from "react";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
+  compareModeAtom,
+  comparePairAtom,
+  compareSelectionAtom,
   diffCountsAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
 /**
  * Resets history state when pageId changes.
- * Clears active selection and diff counts.
+ * Clears active selection, diff counts, and compare state.
+ * Compare state also resets on unmount so reopening the modal starts clean.
  */
 export function useHistoryReset(pageId: string) {
   const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
   const [, setDiffCounts] = useAtom(diffCountsAtom);
+  const [, setCompareMode] = useAtom(compareModeAtom);
+  const [, setCompareSelection] = useAtom(compareSelectionAtom);
+  const [, setComparePair] = useAtom(comparePairAtom);
 
   useEffect(() => {
+    const resetCompare = () => {
+      setCompareMode(false);
+      setCompareSelection([]);
+      setComparePair(null);
+    };
+
     setActiveHistoryId("");
     setActiveHistoryPrevId("");
-    // @ts-ignore
     setDiffCounts(null);
-  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
+    resetCompare();
+
+    return resetCompare;
+  }, [
+    pageId,
+    setActiveHistoryId,
+    setActiveHistoryPrevId,
+    setDiffCounts,
+    setCompareMode,
+    setCompareSelection,
+    setComparePair,
+  ]);
 }

apps/client/src/features/page-history/hooks/use-history-restore.tsx

@@ -1,4 +1,4 @@
-import { useAtom, useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue, useSetAtom } from "jotai";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Text } from "@mantine/core";
@@ -9,7 +9,8 @@ import {
   activeHistoryIdAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
+import { fetchPageHistory } from "@/features/page-history/queries/page-history-query";
+import { IPageHistory } from "@/features/page-history/types/page.types";
 import {
   pageEditorAtom,
   titleEditorAtom,
@@ -25,8 +26,6 @@ export function useHistoryRestore() {
   const { t } = useTranslation();
 
   const activeHistoryId = useAtomValue(activeHistoryIdAtom);
-  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
-
   const mainEditor = useAtomValue(pageEditorAtom);
   const mainEditorTitle = useAtomValue(titleEditorAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
@@ -40,47 +39,66 @@ export function useHistoryRestore() {
     SpaceCaslSubject.Page,
   );
 
-  const handleRestore = useCallback(() => {
-    if (!activeHistoryData) return;
-    if (
-      !mainEditor ||
-      mainEditor.isDestroyed ||
-      !mainEditorTitle ||
-      mainEditorTitle.isDestroyed
-    ) {
-      return;
-    }
+  const handleRestore = useCallback(
+    async (historyId: string) => {
+      let historyData: IPageHistory;
+      try {
+        historyData = await fetchPageHistory(historyId);
+      } catch {
+        notifications.show({
+          message: t("Error fetching page data."),
+          color: "red",
+        });
+        return;
+      }
 
-    mainEditorTitle
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.title, { emitUpdate: true })
-      .run();
+      if (
+        !mainEditor ||
+        mainEditor.isDestroyed ||
+        !mainEditorTitle ||
+        mainEditorTitle.isDestroyed
+      ) {
+        return;
+      }
 
-    mainEditor
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.content)
-      .run();
+      mainEditorTitle
+        .chain()
+        .clearContent()
+        .setContent(historyData.title, { emitUpdate: true })
+        .run();
 
-    setHistoryModalOpen(false);
-    notifications.show({ message: t("Successfully restored") });
-  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);
+      mainEditor
+        .chain()
+        .clearContent()
+        .setContent(historyData.content)
+        .run();
 
-  const confirmRestore = useCallback(() => {
-    modals.openConfirmModal({
-      title: t("Please confirm your action"),
-      children: (
-        <Text size="sm">
-          {t(
-            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-          )}
-        </Text>
-      ),
-      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-      onConfirm: handleRestore,
-    });
-  }, [t, handleRestore]);
+      setHistoryModalOpen(false);
+      notifications.show({ message: t("Successfully restored") });
+    },
+    [mainEditor, mainEditorTitle, setHistoryModalOpen, t],
+  );
+
+  const confirmRestore = useCallback(
+    (historyId?: string) => {
+      const targetId = historyId ?? activeHistoryId;
+      if (!targetId) return;
+
+      modals.openConfirmModal({
+        title: t("Please confirm your action"),
+        children: (
+          <Text size="sm">
+            {t(
+              "Are you sure you want to restore this version? Any changes not versioned will be lost.",
+            )}
+          </Text>
+        ),
+        labels: { confirm: t("Confirm"), cancel: t("Cancel") },
+        onConfirm: () => handleRestore(targetId),
+      });
+    },
+    [t, handleRestore, activeHistoryId],
+  );
 
   return { canRestore, confirmRestore };
 }

apps/client/src/features/page-history/queries/page-history-query.ts

@@ -23,6 +23,14 @@ export function prefetchPageHistory(historyId: string) {
   });
 }
 
+export function fetchPageHistory(historyId: string): Promise<IPageHistory> {
+  return queryClient.fetchQuery({
+    queryKey: ["page-history", historyId],
+    queryFn: () => getPageHistoryById(historyId),
+    staleTime: HISTORY_STALE_TIME,
+  });
+}
+
 export function usePageHistoryListQuery(
   pageId: string,
 ): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {

apps/client/src/features/page-history/utils/resolve-compare-pair.test.ts

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { resolveComparePair } from "./resolve-compare-pair";
+
+// list is newest-first, matching usePageHistoryListQuery order
+const items = [{ id: "v3" }, { id: "v2" }, { id: "v1" }];
+
+describe("resolveComparePair", () => {
+  it("orders newer before older regardless of selection order", () => {
+    expect(resolveComparePair(items, ["v1", "v3"])).toEqual({
+      newerId: "v3",
+      olderId: "v1",
+    });
+    expect(resolveComparePair(items, ["v3", "v1"])).toEqual({
+      newerId: "v3",
+      olderId: "v1",
+    });
+  });
+
+  it("returns null unless exactly two versions are selected", () => {
+    expect(resolveComparePair(items, [])).toBeNull();
+    expect(resolveComparePair(items, ["v1"])).toBeNull();
+    expect(resolveComparePair(items, ["v1", "v2", "v3"])).toBeNull();
+  });
+
+  it("returns null when a selected id is not in the list", () => {
+    expect(resolveComparePair(items, ["v1", "missing"])).toBeNull();
+  });
+
+  it("returns null when the same id is selected twice", () => {
+    expect(resolveComparePair(items, ["v2", "v2"])).toBeNull();
+  });
+});

apps/client/src/features/page-history/utils/resolve-compare-pair.ts

@@ -0,0 +1,18 @@
+import { ComparePair } from "@/features/page-history/atoms/history-atoms";
+
+/**
+ * Resolves which of the two selected versions is newer using their position
+ * in the history list (list is newest-first: lower index = newer).
+ */
+export function resolveComparePair(
+  historyItems: { id: string }[],
+  selection: string[],
+): ComparePair | null {
+  if (selection.length !== 2) return null;
+  const indexA = historyItems.findIndex((item) => item.id === selection[0]);
+  const indexB = historyItems.findIndex((item) => item.id === selection[1]);
+  if (indexA === -1 || indexB === -1 || indexA === indexB) return null;
+  return indexA < indexB
+    ? { newerId: selection[0], olderId: selection[1] }
+    : { newerId: selection[1], olderId: selection[0] };
+}

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -11,6 +11,7 @@ import {
   IconList,
   IconMarkdown,
   IconMessage,
+  IconPaperclip,
   IconPrinter,
   IconStar,
   IconStarFilled,
@@ -42,6 +43,7 @@ import {
 import { formattedDate } from "@/lib/time.ts";
 import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
+import PageAttachmentsModal from "@/features/attachments/components/page-attachments-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
 import {
@@ -157,6 +159,10 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     verificationOpened,
     { open: openVerificationModal, close: closeVerificationModal },
   ] = useDisclosure(false);
+  const [
+    attachmentsOpened,
+    { open: openAttachmentsModal, close: closeAttachmentsModal },
+  ] = useDisclosure(false);
   const [pageEditor] = useAtom(pageEditorAtom);
   const pageUpdatedAt = useTimeAgo(page?.updatedAt);
   const favoriteIds = useFavoriteIds("page", page?.spaceId);
@@ -293,6 +299,15 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
             </Menu.Item>
           )}
 
+          {!page?.isBase && (
+            <Menu.Item
+              leftSection={<IconPaperclip size={16} />}
+              onClick={openAttachmentsModal}
+            >
+              {t("Attachments")}
+            </Menu.Item>
+          )}
+
           {!readOnly && !page?.isBase && (
             <PageVerificationMenuItem
               pageId={page?.id}
@@ -395,6 +410,12 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
         opened={verificationOpened}
         onClose={closeVerificationModal}
       />
+
+      <PageAttachmentsModal
+        pageId={page.id}
+        open={attachmentsOpened}
+        onClose={closeAttachmentsModal}
+      />
     </>
   );
 }

apps/client/src/features/search/components/creator-filter-menu.tsx

@@ -0,0 +1,120 @@
+import { ReactNode, useState } from "react";
+import { Divider, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
+import { IconCheck, IconSearch } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useSearchSuggestionsQuery } from "@/features/search/queries/search-query";
+import { RadioMenuItem } from "@/components/ui/radio-menu-item";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import { IUser } from "@/features/user/types/user.types.ts";
+
+type CreatorFilterMenuProps = {
+  value: string | null;
+  onChange: (user: IUser | null) => void;
+  children: ReactNode;
+  width?: number;
+  position?:
+    | "bottom-start"
+    | "bottom-end"
+    | "bottom"
+    | "top-start"
+    | "top-end"
+    | "top";
+  zIndex?: number;
+};
+
+export function CreatorFilterMenu({
+  value,
+  onChange,
+  children,
+  width = 280,
+  position = "bottom-end",
+  zIndex,
+}: CreatorFilterMenuProps) {
+  const { t } = useTranslation();
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
+
+  const { data: suggestion, isLoading } = useSearchSuggestionsQuery({
+    query: debouncedQuery,
+    includeUsers: true,
+    includeGroups: false,
+    includePages: false,
+    preload: true,
+  });
+
+  const users: IUser[] = (suggestion?.users as IUser[]) ?? [];
+
+  return (
+    <Menu shadow="md" width={width} position={position} zIndex={zIndex}>
+      <Menu.Target>{children}</Menu.Target>
+      <Menu.Dropdown>
+        <TextInput
+          placeholder={t("Find a user")}
+          data-autofocus
+          autoFocus
+          leftSection={<IconSearch size={16} />}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          size="sm"
+          variant="filled"
+          radius="sm"
+          styles={{ input: { marginBottom: 8 } }}
+        />
+
+        <ScrollArea.Autosize mah={280}>
+          <Menu.Item
+            component={RadioMenuItem}
+            aria-checked={!value}
+            onClick={() => onChange(null)}
+          >
+            <Group flex="1" gap="xs">
+              <div style={{ flex: 1 }}>
+                <Text size="sm" fw={500}>
+                  {t("Anyone")}
+                </Text>
+              </div>
+              {!value && <IconCheck size={20} aria-hidden />}
+            </Group>
+          </Menu.Item>
+
+          <Divider my="xs" />
+
+          {users.length === 0 && (
+            <Text size="xs" c="dimmed" px="xs" py="sm">
+              {isLoading ? t("Loading...") : t("No users found")}
+            </Text>
+          )}
+
+          {users.map((user) => (
+            <Menu.Item
+              key={user.id}
+              component={RadioMenuItem}
+              aria-checked={value === user.id}
+              onClick={() => onChange(user)}
+            >
+              <Group flex="1" gap="xs">
+                <CustomAvatar
+                  avatarUrl={user.avatarUrl}
+                  size={20}
+                  name={user.name}
+                />
+                <div style={{ flex: 1, minWidth: 0 }}>
+                  <Text size="sm" fw={500} truncate>
+                    {user.name}
+                  </Text>
+                  {user.email && (
+                    <Text size="xs" c="dimmed" truncate>
+                      {user.email}
+                    </Text>
+                  )}
+                </div>
+                {value === user.id && <IconCheck size={20} aria-hidden />}
+              </Group>
+            </Menu.Item>
+          ))}
+        </ScrollArea.Autosize>
+      </Menu.Dropdown>
+    </Menu>
+  );
+}

apps/client/src/features/search/components/label-filter-menu.tsx

@@ -0,0 +1,120 @@
+import { ReactNode, useMemo, useState } from "react";
+import {
+  Group,
+  Menu,
+  ScrollArea,
+  Text,
+  TextInput,
+  useComputedColorScheme,
+} from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
+import { IconCheck, IconSearch } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useWorkspaceLabelsQuery } from "@/features/label/queries/label-query.ts";
+import { getLabelColor } from "@/features/label/utils/label-colors.ts";
+import { CheckboxMenuItem } from "@/components/ui/checkbox-menu-item";
+
+type LabelFilterMenuProps = {
+  value: string[];
+  onChange: (labelIds: string[]) => void;
+  children: ReactNode;
+  width?: number;
+  position?:
+    | "bottom-start"
+    | "bottom-end"
+    | "bottom"
+    | "top-start"
+    | "top-end"
+    | "top";
+  zIndex?: number;
+};
+
+export function LabelFilterMenu({
+  value,
+  onChange,
+  children,
+  width = 280,
+  position = "bottom-end",
+  zIndex,
+}: LabelFilterMenuProps) {
+  const { t } = useTranslation();
+  const scheme = useComputedColorScheme("light");
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
+
+  const { data, isLoading } = useWorkspaceLabelsQuery(debouncedQuery, true);
+  const labels = data?.items ?? [];
+
+  const selectedSet = useMemo(() => new Set(value), [value]);
+
+  const toggleLabel = (labelId: string) => {
+    if (selectedSet.has(labelId)) {
+      onChange(value.filter((id) => id !== labelId));
+    } else {
+      onChange([...value, labelId]);
+    }
+  };
+
+  return (
+    <Menu
+      shadow="md"
+      width={width}
+      position={position}
+      zIndex={zIndex}
+      closeOnItemClick={false}
+    >
+      <Menu.Target>{children}</Menu.Target>
+      <Menu.Dropdown>
+        <TextInput
+          placeholder={t("Find a label")}
+          data-autofocus
+          autoFocus
+          leftSection={<IconSearch size={16} />}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          size="sm"
+          variant="filled"
+          radius="sm"
+          styles={{ input: { marginBottom: 8 } }}
+        />
+
+        <ScrollArea.Autosize mah={280}>
+          {labels.length === 0 && (
+            <Text size="xs" c="dimmed" px="xs" py="sm">
+              {isLoading ? t("Loading...") : t("No labels found")}
+            </Text>
+          )}
+
+          {labels.map((label) => {
+            const isChecked = selectedSet.has(label.id);
+            const color = getLabelColor(label.name, scheme);
+            return (
+              <Menu.Item
+                key={label.id}
+                component={CheckboxMenuItem}
+                aria-checked={isChecked}
+                onClick={() => toggleLabel(label.id)}
+              >
+                <Group flex="1" gap="xs">
+                  <span
+                    style={{
+                      width: 8,
+                      height: 8,
+                      borderRadius: "50%",
+                      background: color.dot,
+                      flexShrink: 0,
+                    }}
+                  />
+                  <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
+                    {label.name}
+                  </Text>
+                  {isChecked && <IconCheck size={20} aria-hidden />}
+                </Group>
+              </Menu.Item>
+            );
+          })}
+        </ScrollArea.Autosize>
+      </Menu.Dropdown>
+    </Menu>
+  );
+}

apps/client/src/features/search/components/search-spotlight-filters.tsx

@@ -13,16 +13,20 @@ import {
   IconBuilding,
   IconFileDescription,
   IconCheck,
+  IconUser,
+  IconTag,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu";
+import { CreatorFilterMenu } from "@/features/search/components/creator-filter-menu";
 import { RadioMenuItem } from "@/components/ui/radio-menu-item";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import classes from "./search-spotlight-filters.module.css";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { LabelFilterMenu } from "./label-filter-menu";
 
 interface SearchSpotlightFiltersProps {
   onFiltersChange?: (filters: any) => void;
@@ -40,9 +44,14 @@ export function SearchSpotlightFilters({
   const { t } = useTranslation();
   const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
   const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(
-    spaceId || null,
+    spaceId || null
   );
   const [contentType, setContentType] = useState<string | null>("page");
+  const [selectedCreatorId, setSelectedCreatorId] = useState<string | null>(null);
+  const [selectedCreatorName, setSelectedCreatorName] = useState<string | null>(
+    null
+  );
+  const [selectedLabelIds, setSelectedLabelIds] = useState<string[]>([]);
   const [workspace] = useAtom(workspaceAtom);
 
   const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
@@ -50,15 +59,6 @@ export function SearchSpotlightFilters({
     ? spacesData?.items.find((space) => space.id === selectedSpaceId)
     : null;
 
-  useEffect(() => {
-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: selectedSpaceId,
-        contentType,
-      });
-    }
-  }, []);
-
   const contentTypeOptions = [
     { value: "page", label: t("Pages") },
     {
@@ -68,37 +68,39 @@ export function SearchSpotlightFilters({
     },
   ];
 
+  useEffect(() => {
+    onFiltersChange?.({
+      spaceId: selectedSpaceId,
+      contentType,
+      creatorId: selectedCreatorId,
+      labelIds: selectedLabelIds,
+    });
+  }, [
+    selectedSpaceId,
+    contentType,
+    selectedCreatorId,
+    selectedLabelIds,
+    onFiltersChange,
+  ]);
+
   const handleSpaceSelect = (spaceId: string | null) => {
     setSelectedSpaceId(spaceId);
-
-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: spaceId,
-        contentType,
-      });
-    }
   };
 
-  const handleFilterChange = (filterType: string, value: any) => {
-    let newSelectedSpaceId = selectedSpaceId;
-    let newContentType = contentType;
+  const handleCreatorSelect = (user: { id: string; name: string } | null) => {
+    setSelectedCreatorId(user?.id ?? null);
+    setSelectedCreatorName(user?.name ?? null);
+  };
 
-    switch (filterType) {
-      case "spaceId":
-        newSelectedSpaceId = value;
-        setSelectedSpaceId(value);
-        break;
-      case "contentType":
-        newContentType = value;
-        setContentType(value);
-        break;
-    }
+  const handleLabelsSelect = (labelIds: string[]) => {
+    setSelectedLabelIds(labelIds);
+  };
 
-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: newSelectedSpaceId,
-        contentType: newContentType,
-      });
+  const handleChangeContentType = (value: string) => {
+    setContentType(value);
+
+    if (value === "attachment") {
+      setSelectedLabelIds([]);
     }
   };
 
@@ -181,7 +183,7 @@ export function SearchSpotlightFilters({
               onClick={() =>
                 !option.disabled &&
                 contentType !== option.value &&
-                handleFilterChange("contentType", option.value)
+                handleChangeContentType(option.value)
               }
               disabled={
                 option.disabled || (isAiMode && option.value === "attachment")
@@ -195,13 +197,11 @@ export function SearchSpotlightFilters({
                       {t("Enterprise")}
                     </Badge>
                   )}
-                  {!option.disabled &&
-                    isAiMode &&
-                    option.value === "attachment" && (
-                      <Text size="xs" mt={4}>
-                        {t("AI Answers not available for attachments")}
-                      </Text>
-                    )}
+                  {!option.disabled && isAiMode && option.value === "attachment" && (
+                    <Text size="xs" mt={4}>
+                      {t("AI Answers not available for attachments")}
+                    </Text>
+                  )}
                 </div>
                 {contentType === option.value && <IconCheck size={20} aria-hidden />}
               </Group>
@@ -209,6 +209,52 @@ export function SearchSpotlightFilters({
           ))}
         </Menu.Dropdown>
       </Menu>
+
+      <CreatorFilterMenu
+        value={selectedCreatorId}
+        onChange={handleCreatorSelect}
+        position="bottom-start"
+        width={250}
+        zIndex={getDefaultZIndex("max")}
+      >
+        <Button
+          variant="subtle"
+          color="gray"
+          size="sm"
+          rightSection={<IconChevronDown size={14} />}
+          leftSection={<IconUser size={16} />}
+          className={classes.filterButton}
+          fw={500}
+        >
+          {selectedCreatorId
+            ? `${t("Created by")}: ${selectedCreatorName || t("Unknown")}`
+            : `${t("Created by")}: ${t("Anyone")}`}
+        </Button>
+      </CreatorFilterMenu>
+
+      {contentType !== "attachment" && (
+        <LabelFilterMenu
+          value={selectedLabelIds}
+          onChange={handleLabelsSelect}
+          position="bottom-start"
+          width={250}
+          zIndex={getDefaultZIndex("max")}
+        >
+          <Button
+            variant="subtle"
+            color="gray"
+            size="sm"
+            rightSection={<IconChevronDown size={14} />}
+            leftSection={<IconTag size={16} />}
+            className={classes.filterButton}
+            fw={500}
+          >
+            {selectedLabelIds.length > 0
+              ? `${t("Labels")} (${selectedLabelIds.length})`
+              : t("Labels")}
+          </Button>
+        </LabelFilterMenu>
+      )}
     </div>
   );
 }

apps/client/src/features/search/components/search-spotlight.tsx

@@ -1,7 +1,7 @@
 import { Spotlight } from "@mantine/spotlight";
 import { IconSearch, IconSparkles } from "@tabler/icons-react";
 import { Group, Button, VisuallyHidden } from "@mantine/core";
-import React, { useState, useMemo, useEffect } from "react";
+import React, { useState, useMemo, useEffect, useCallback } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 import { notifications } from "@mantine/notifications";
@@ -26,6 +26,8 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
   const [filters, setFilters] = useState<{
     spaceId?: string | null;
     contentType?: string;
+    creatorId?: string | null;
+    labelIds?: string[];
   }>({
     contentType: "page",
   });
@@ -43,6 +45,14 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
       params.spaceId = filters.spaceId;
     }
 
+    if (filters.creatorId) {
+      params.creatorId = filters.creatorId;
+    }
+
+    if (filters.labelIds?.length) {
+      params.labelIds = filters.labelIds;
+    }
+
     return params;
   }, [debouncedSearchQuery, filters]);
 
@@ -96,9 +106,9 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
     />
   ));
 
-  const handleFiltersChange = (newFilters: any) => {
+  const handleFiltersChange = useCallback((newFilters: any) => {
     setFilters(newFilters);
-  };
+  }, [setFilters]);
 
   const handleAskClick = () => {
     setIsAiMode(!isAiMode);

apps/client/src/features/search/types/search.types.ts

@@ -36,6 +36,8 @@ export interface IPageSearchParams {
   query: string;
   spaceId?: string;
   shareId?: string;
+  creatorId?: string;
+  labelIds?: string[];
 }
 
 export interface IAttachmentSearch {

apps/client/src/features/space/components/sidebar/space-select.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { Group, Select, SelectProps, Text } from "@mantine/core";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
@@ -14,6 +14,7 @@ interface SpaceSelectProps {
   width?: number;
   opened?: boolean;
   clearable?: boolean;
+  withinPortal?: boolean;
 }
 
 const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
@@ -41,6 +42,7 @@ export function SpaceSelect({
   width,
   opened,
   clearable,
+  withinPortal = true,
 }: SpaceSelectProps) {
   const { t } = useTranslation();
   const [searchValue, setSearchValue] = useState("");
@@ -50,9 +52,13 @@ export function SpaceSelect({
     limit: 50,
   });
   const [data, setData] = useState([]);
+  const fetchedSpaces = useRef(new Map<string, ISpace>());
 
   useEffect(() => {
     if (spaces) {
+      spaces.items.forEach((space: ISpace) =>
+        fetchedSpaces.current.set(space.slug, space),
+      );
       const spaceData = spaces?.items
         .filter((space: ISpace) => space.slug !== value)
         .map((space: ISpace) => {
@@ -83,14 +89,19 @@ export function SpaceSelect({
       onSearchChange={setSearchValue}
       clearable={clearable}
       variant="filled"
-      onChange={(slug) =>
-        onChange(spaces.items?.find((item) => item.slug === slug))
-      }
+      onChange={(slug) => {
+        // options accumulate across fetches; resolve against everything
+        // fetched, not just the latest query result
+        const space = slug && fetchedSpaces.current.get(slug);
+        if (space) {
+          onChange(space);
+        }
+      }}
       onClick={(e) => e.stopPropagation()}
       nothingFoundMessage={t("No space found")}
       limit={50}
       checkIconPosition="right"
-      comboboxProps={{ width, withinPortal: true, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
+      comboboxProps={{ width, withinPortal, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
       dropdownOpened={opened}
     />
   );

apps/client/src/features/space/components/sidebar/switch-space.tsx

@@ -70,6 +70,7 @@ export function SwitchSpace({
           onChange={(space) => handleSelect(space.slug)}
           width={300}
           opened={true}
+          withinPortal={false}
         />
       </Popover.Dropdown>
     </Popover>

apps/client/src/pages/auth/forgot-password.tsx

@@ -1,13 +1,10 @@
 import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
-import { getAppName } from "@/lib/config";
-import { Helmet } from "react-helmet-async";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function ForgotPassword() {
     return (
         <>
-            <Helmet>
-                <title>Forgot Password - {getAppName()}</title>
-            </Helmet>
+            <DocumentTitle title="Forgot Password" />
             <ForgotPasswordForm />
         </>
     );

apps/client/src/pages/auth/invite-signup.tsx

@@ -1,16 +1,13 @@
-import { Helmet } from "react-helmet-async";
 import { InviteSignUpForm } from "@/features/auth/components/invite-sign-up-form.tsx";
-import {getAppName} from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function InviteSignup() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>{t("Invitation Signup")} - {getAppName()}</title>
-      </Helmet>
+      <DocumentTitle title={t("Invitation Signup")} />
       <InviteSignUpForm />
     </>
   );

apps/client/src/pages/auth/login.tsx

@@ -1,18 +1,13 @@
 import { LoginForm } from "@/features/auth/components/login-form";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function LoginPage() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Login")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Login")} />
       <LoginForm />
     </>
   );

apps/client/src/pages/auth/password-reset.tsx

@@ -1,11 +1,10 @@
-import { Helmet } from "react-helmet-async";
 import { PasswordResetForm } from "@/features/auth/components/password-reset-form";
 import { Link, useSearchParams } from "react-router-dom";
 import { useVerifyUserTokenQuery } from "@/features/auth/queries/auth-query";
 import { Button, Container, Group, Text } from "@mantine/core";
 import APP_ROUTE from "@/lib/app-route";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function PasswordReset() {
   const { t } = useTranslation();
@@ -23,11 +22,7 @@ export default function PasswordReset() {
   if (isError || !resetToken) {
     return (
       <>
-        <Helmet>
-          <title>
-            {t("Password Reset")} - {getAppName()}
-          </title>
-        </Helmet>
+        <DocumentTitle title={t("Password Reset")} />
         <Container my={40}>
           <Text size="lg" ta="center">
             {t("Invalid or expired password reset link")}
@@ -49,11 +44,7 @@ export default function PasswordReset() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Password Reset")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Password Reset")} />
       <PasswordResetForm resetToken={resetToken} />
     </>
   );

apps/client/src/pages/auth/setup-workspace.tsx

@@ -1,11 +1,10 @@
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
-import { Helmet } from "react-helmet-async";
 import React, { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import APP_ROUTE from "@/lib/app-route.ts";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function SetupWorkspace() {
   const { t } = useTranslation();
@@ -35,11 +34,7 @@ export default function SetupWorkspace() {
   ) {
     return (
       <>
-        <Helmet>
-          <title>
-            {t("Setup Workspace")} - {getAppName()}
-          </title>
-        </Helmet>
+        <DocumentTitle title={t("Setup Workspace")} />
         <SetupWorkspaceForm />
       </>
     );

apps/client/src/pages/dashboard/home.tsx

@@ -2,20 +2,15 @@ import { Container, Space } from "@mantine/core";
 import HomeTabs from "@/features/home/components/home-tabs";
 import HomeAiPrompt from "@/features/home/components/home-ai-prompt";
 import SpaceCarousel from "@/features/space/components/space-carousel.tsx";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Home() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Home")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Home")} />
       <Container size={"900"} pt="xl">
         <HomeAiPrompt />
 

apps/client/src/pages/label/label-page.tsx

@@ -17,9 +17,7 @@ import {
 } from "@tabler/icons-react";
 import { Link, useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { Helmet } from "react-helmet-async";
 import { useDebouncedValue } from "@mantine/hooks";
-import { getAppName } from "@/lib/config";
 import { useLabelPagesQuery } from "@/features/label/queries/label-query.ts";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
 import { getLabelColor } from "@/features/label/utils/label-colors.ts";
@@ -29,6 +27,7 @@ import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu.tsx";
 import { EmptyState } from "@/components/ui/empty-state";
 import classes from "@/features/label/label.module.css";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function LabelPage() {
   const { t } = useTranslation();
@@ -82,11 +81,7 @@ export default function LabelPage() {
 
   return (
     <>
-      <Helmet>
-        <title>
-          {labelName} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={labelName} />
 
       <Container size={820} py="xl">
         <Stack gap="lg">

apps/client/src/pages/page/page.tsx

@@ -3,7 +3,6 @@ import { usePageQuery } from "@/features/page/queries/page-query";
 import { FullEditor } from "@/features/editor/full-editor";
 import { TitleEditor } from "@/features/editor/title-editor";
 import HistoryModal from "@/features/page-history/components/history-modal";
-import { Helmet } from "react-helmet-async";
 import PageHeader from "@/features/page/components/header/page-header.tsx";
 import { extractPageSlugId } from "@/lib";
 import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
@@ -18,6 +17,7 @@ import { BaseView } from "@/ee/base/components/base-view";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import { getPageTitle } from "@/features/page/page.utils";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 const MemoizedFullEditor = React.memo(FullEditor);
 const MemoizedTitleEditor = React.memo(TitleEditor);
 const MemoizedPageHeader = React.memo(PageHeader);
@@ -110,9 +110,10 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
           paddingTop: "calc(var(--page-header-height) + 6px)",
         }}
       >
-        <Helmet>
-          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
-        </Helmet>
+        <DocumentTitle
+          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
+          withAppName={false}
+        />
         <MemoizedPageHeader readOnly={!canEdit} />
         <div
           style={{
@@ -159,9 +160,10 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
   return (
     page && (
       <div>
-        <Helmet>
-          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
-        </Helmet>
+        <DocumentTitle
+          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
+          withAppName={false}
+        />
 
         <MemoizedPageHeader readOnly={!canEdit} />
 

apps/client/src/pages/settings/account/account-preferences.tsx

@@ -5,21 +5,16 @@ import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
 import PageEditPref from "@/features/user/components/page-state-pref";
 import FixedToolbarPref from "@/features/user/components/fixed-toolbar-pref";
 import NotificationPref from "@/features/user/components/notification-pref";
-import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AccountPreferences() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Preferences")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Preferences")} />
       <SettingsTitle title={t("Preferences")} />
 
       <AccountTheme />

apps/client/src/pages/settings/account/account-settings.tsx

@@ -4,22 +4,17 @@ import ChangePassword from "@/features/user/components/change-password";
 import { Divider } from "@mantine/core";
 import AccountAvatar from "@/features/user/components/account-avatar";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { AccountMfaSection } from "@/features/user/components/account-mfa-section";
 import SessionList from "@/features/session/components/session-list";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AccountSettings() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("My Profile")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("My Profile")} />
       <SettingsTitle title={t("My Profile")} />
 
       <AccountAvatar />

apps/client/src/pages/settings/group/group-info.tsx

@@ -1,20 +1,15 @@
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import GroupMembersList from "@/features/group/components/group-members";
 import GroupDetails from "@/features/group/components/group-details";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function GroupInfo() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
-        <title>
-          {t("Manage Group")} - {getAppName()}
-        </title>
-      </Helmet>
+      <DocumentTitle title={t("Manage Group")} />
       <SettingsTitle title={t("Manage Group")} />
       <GroupDetails />
       <GroupMembersList />