custom tier

feat: tiered billing (cloud)
v0.21.0
2025-11-20 07:21:09 +10:00 · 2025-06-24 04:42:09 -07:00 · 2025-06-24 04:21:38 -07:00 · 2025-06-18 14:28:14 -07:00 · 2025-06-18 14:25:40 -07:00 · 2025-06-18 13:58:41 -07:00
64 changed files with 3148 additions and 1010 deletions
--- a/apps/client/package.json
+++ b/apps/client/package.json
@ -1,7 +1,7 @@
 {
  "name": "client",
  "private": true,
-  "version": "0.20.4",
+  "version": "0.21.0",
  "scripts": {
    "dev": "vite",
    "build": "tsc && vite build",
@ -15,45 +15,46 @@
    "@docmost/editor-ext": "workspace:*",
    "@emoji-mart/data": "^1.2.1",
    "@emoji-mart/react": "^1.1.1",
-    "@excalidraw/excalidraw": "^0.17.6",
+    "@excalidraw/excalidraw": "0.18.0-864353b",
    "@mantine/core": "^7.17.0",
    "@mantine/form": "^7.17.0",
    "@mantine/hooks": "^7.17.0",
    "@mantine/modals": "^7.17.0",
    "@mantine/notifications": "^7.17.0",
    "@mantine/spotlight": "^7.17.0",
-    "@tabler/icons-react": "^3.22.0",
-    "@tanstack/react-query": "^5.61.4",
-    "@tiptap/extension-character-count": "^2.11.5",
-    "axios": "^1.8.4",
+    "@tabler/icons-react": "^3.34.0",
+    "@tanstack/react-query": "^5.80.6",
+    "@tiptap/extension-character-count": "^2.10.3",
+    "alfaaz": "^1.1.0",
+    "axios": "^1.9.0",
    "clsx": "^2.1.1",
    "emoji-mart": "^5.6.0",
    "file-saver": "^2.0.5",
    "highlightjs-sap-abap": "^0.3.0",
    "i18next": "^23.14.0",
    "i18next-http-backend": "^2.6.1",
-    "jotai": "^2.12.1",
+    "jotai": "^2.12.5",
    "jotai-optics": "^0.4.0",
    "js-cookie": "^3.0.5",
    "jwt-decode": "^4.0.0",
-    "katex": "0.16.21",
-    "lowlight": "^3.2.0",
-    "mermaid": "^11.4.1",
+    "katex": "0.16.22",
+    "lowlight": "^3.3.0",
+    "mermaid": "^11.6.0",
    "mitt": "^3.0.1",
    "react": "^18.3.1",
    "react-arborist": "3.4.0",
-    "react-clear-modal": "^2.0.11",
+    "react-clear-modal": "^2.0.15",
    "react-dom": "^18.3.1",
    "react-drawio": "^1.0.1",
    "react-error-boundary": "^4.1.2",
    "react-helmet-async": "^2.0.5",
    "react-i18next": "^15.0.1",
    "react-router-dom": "^7.0.1",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
    "socket.io-client": "^4.8.1",
    "tippy.js": "^6.3.7",
    "tiptap-extension-global-drag-handle": "^0.1.18",
-    "zod": "^3.23.8"
+    "zod": "^3.25.56"
  },
  "devDependencies": {
    "@eslint/js": "^9.16.0",
@ -77,6 +78,6 @@
    "prettier": "^3.4.1",
    "typescript": "^5.7.2",
    "typescript-eslint": "^8.17.0",
-    "vite": "^6.3.2"
+    "vite": "^6.3.5"
  }
 }
--- a/apps/client/public/locales/de-DE/translation.json
+++ b/apps/client/public/locales/de-DE/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Öffentlich geteilte Seiten aus Bereichen, in denen Sie Mitglied sind, erscheinen hier",
  "Share deleted successfully": "Freigabe erfolgreich gelöscht",
  "Share not found": "Freigabe nicht gefunden",
-  "Failed to share page": "Fehler beim Teilen der Seite"
+  "Failed to share page": "Fehler beim Teilen der Seite",
+  "Copy page": "Seite kopieren",
+  "Copy page to a different space.": "Seite in einen anderen Bereich kopieren.",
+  "Page copied successfully": "Seite erfolgreich kopiert"
 }
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@ -354,6 +354,9 @@
  "Character count: {{characterCount}}": "Character count: {{characterCount}}",
  "New update": "New update",
  "{{latestVersion}} is available": "{{latestVersion}} is available",
+  "Default page edit mode": "Default page edit mode",
+  "Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
+  "Reading": "Reading"
  "Delete member": "Delete member",
  "Member deleted successfully": "Member deleted successfully",
  "Are you sure you want to delete this workspace member? This action is irreversible.": "Are you sure you want to delete this workspace member? This action is irreversible.",
@ -384,7 +387,7 @@
  "Share deleted successfully": "Share deleted successfully",
  "Share not found": "Share not found",
  "Failed to share page": "Failed to share page",
-  "Copy page":  "Copy page",
+  "Copy page": "Copy page",
  "Copy page to a different space.": "Copy page to a different space.",
  "Page copied successfully": "Page copied successfully"
 }
--- a/apps/client/public/locales/es-ES/translation.json
+++ b/apps/client/public/locales/es-ES/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Las páginas compartidas públicamente de los espacios a los que pertenece aparecerán aquí",
  "Share deleted successfully": "Compartición eliminada con éxito",
  "Share not found": "Compartición no encontrada",
-  "Failed to share page": "Error al compartir la página"
+  "Failed to share page": "Error al compartir la página",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }
--- a/apps/client/public/locales/fr-FR/translation.json
+++ b/apps/client/public/locales/fr-FR/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Les pages partagées publiquement des espaces dont vous êtes membre apparaîtront ici",
  "Share deleted successfully": "Partage supprimé avec succès",
  "Share not found": "Partage non trouvé",
-  "Failed to share page": "Échec du partage de la page"
+  "Failed to share page": "Échec du partage de la page",
+  "Copy page": "Copier la page",
+  "Copy page to a different space.": "Copier la page dans un autre espace.",
+  "Page copied successfully": "Page copiée avec succès"
 }
--- a/apps/client/public/locales/it-IT/translation.json
+++ b/apps/client/public/locales/it-IT/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Le pagine condivise pubblicamente dagli spazi di cui sei membro appariranno qui",
  "Share deleted successfully": "Condivisione eliminata con successo",
  "Share not found": "Condivisione non trovata",
-  "Failed to share page": "Condivisione della pagina fallita"
+  "Failed to share page": "Condivisione della pagina fallita",
+  "Copy page": "Copia pagina",
+  "Copy page to a different space.": "Copia pagina in un altro spazio.",
+  "Page copied successfully": "Pagina copiata con successo"
 }
--- a/apps/client/public/locales/ja-JP/translation.json
+++ b/apps/client/public/locales/ja-JP/translation.json
@ -347,7 +347,7 @@
  "Members added successfully": "メンバーを追加しました",
  "Member removed successfully": "メンバーが削除されました",
  "Member role updated successfully": "メンバーのロールを更新しました",
-  "Created by: <b>{{creatorName}}</b>": "作成者： <b>{{creatorName}}</b>",
+  "Created by: <b>{{creatorName}}</b>": "作成者: <b>{{creatorName}}</b>",
  "Created at: {{time}}": "が作成しました：{{time}}",
  "Edited by {{name}} {{time}}": "最終編集: {{name}} {{time}}",
  "Word count: {{wordCount}}": "ワード数: {{wordCount}}",
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "メンバーであるスペースからの公開ページがここに表示されます",
  "Share deleted successfully": "共有が正常に削除されました",
  "Share not found": "共有が見つかりません",
-  "Failed to share page": "ページの共有に失敗しました"
+  "Failed to share page": "ページの共有に失敗しました",
+  "Copy page": "ページをコピー",
+  "Copy page to a different space.": "ページを別のスペースにコピーします。",
+  "Page copied successfully": "ページのコピーに成功しました"
 }
--- a/apps/client/public/locales/ko-KR/translation.json
+++ b/apps/client/public/locales/ko-KR/translation.json
@ -58,7 +58,7 @@
  "Enter a strong password": "강력한 비밀번호를 입력하세요",
  "Enter valid email addresses separated by comma or space max_50": "유효한 이메일 주소를 쉼표나 공백으로 구분하여 입력하세요 [최대: 50]",
  "enter valid emails addresses": "유효한 이메일 주소를 입력하세요",
-  "Enter your current password": "현재 비밀번호를 입력하세요",
+  "Enter your current password": "기존 비밀번호를 입력하세요",
  "enter your full name": "전체 이름을 입력하세요",
  "Enter your new password": "새 비밀번호를 입력하세요",
  "Enter your new preferred email": "새로운 이메일을 입력하세요",
@ -170,7 +170,7 @@
  "Successfully restored": "복원 완료",
  "System settings": "시스템 설정",
  "Theme": "배경",
-  "To change your email, you have to enter your password and new email.": "이메일을 변경하려면 현재 비밀번호와 새 이메일을 입력해야 합니다.",
+  "To change your email, you have to enter your password and new email.": "이메일을 변경하려면 기존 비밀번호와 새 이메일을 입력해야 합니다.",
  "Toggle full page width": "전체 페이지 너비 전환",
  "Unable to import pages. Please try again.": "페이지를 가져올 수 없습니다. 다시 시도해주세요.",
  "untitled": "제목 없음",
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "회원인 공간의 공개 공유된 페이지가 여기에 표시됩니다",
  "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
  "Share not found": "공유를 찾을 수 없습니다",
-  "Failed to share page": "페이지 공유에 실패했습니다"
+  "Failed to share page": "페이지 공유에 실패했습니다",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }
--- a/apps/client/public/locales/nl-NL/translation.json
+++ b/apps/client/public/locales/nl-NL/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Openbaar gedeelde pagina's van ruimtes waarvan u lid bent, verschijnen hier",
  "Share deleted successfully": "Delen succesvol verwijderd",
  "Share not found": "Delen niet gevonden",
-  "Failed to share page": "Pagina delen mislukt"
+  "Failed to share page": "Pagina delen mislukt",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }
--- a/apps/client/public/locales/pt-BR/translation.json
+++ b/apps/client/public/locales/pt-BR/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Páginas compartilhadas publicamente de espaços que você é membro aparecerão aqui",
  "Share deleted successfully": "Compartilhamento excluído com sucesso",
  "Share not found": "Compartilhamento não encontrado",
-  "Failed to share page": "Falha ao compartilhar página"
+  "Failed to share page": "Falha ao compartilhar página",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }
--- a/apps/client/public/locales/ru-RU/translation.json
+++ b/apps/client/public/locales/ru-RU/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "Общие страницы из пространств, участником которых вы являетесь, появятся здесь",
  "Share deleted successfully": "Общий доступ успешно удален",
  "Share not found": "Общий доступ не найден",
-  "Failed to share page": "Не удалось поделиться страницей"
+  "Failed to share page": "Не удалось поделиться страницей",
+  "Copy page": "Копировать страницу",
+  "Copy page to a different space.": "Копировать страницу в другое пространство.",
+  "Page copied successfully": "Страница успешно скопирована"
 }
--- a/apps/client/public/locales/uk-UA/translation.json
+++ b/apps/client/public/locales/uk-UA/translation.json
@ -0,0 +1,390 @@
+{
+  "Account": "Обліковий запис",
+  "Active": "Активний",
+  "Add": "Додати",
+  "Add group members": "Додати учасників групи",
+  "Add groups": "Додати групи",
+  "Add members": "Додати учасників",
+  "Add to groups": "Додати до груп",
+  "Add space members": "Додати учасників простору",
+  "Admin": "Адміністратор",
+  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "Ви впевнені, що хочете видалити цю групу? Учасники втратять доступ до матеріалів, до яких ця група має доступ.",
+  "Are you sure you want to delete this page?": "Ви впевнені, що хочете видалити цю сторінку?",
+  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Ви впевнені, що хочете видалити цього користувача з групи? Користувач втратить доступ до матеріалів, до яких ця група має доступ.",
+  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Ви впевнені, що хочете видалити цього користувача з простору? Користувач втратить весь доступ до цього простору.",
+  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "Ви впевнені, що хочете відновити цю версію? Усі не збережені зміни будуть втрачені.",
+  "Can become members of groups and spaces in workspace": "Можуть ставати учасниками груп та просторів у робочій області",
+  "Can create and edit pages in space.": "Може створювати та редагувати сторінки в просторі.",
+  "Can edit": "Може редагувати",
+  "Can manage workspace": "Може керувати робочою областю",
+  "Can manage workspace but cannot delete it": "Може керувати робочою областю, але не може її видалити",
+  "Can view": "Може переглядати",
+  "Can view pages in space but not edit.": "Може переглядати сторінки в просторі, але не може їх редагувати.",
+  "Cancel": "Скасувати",
+  "Change email": "Змінити електронну пошту",
+  "Change password": "Змінити пароль",
+  "Change photo": "Змінити фото",
+  "Choose a role": "Оберіть роль",
+  "Choose your preferred color scheme.": "Оберіть бажану кольорову схему.",
+  "Choose your preferred interface language.": "Оберіть бажану мову інтерфейсу.",
+  "Choose your preferred page width.": "Оберіть бажану ширину сторінки.",
+  "Confirm": "Підтвердити",
+  "Copy link": "Копіювати посилання",
+  "Create": "Створити",
+  "Create group": "Створити групу",
+  "Create page": "Створити сторінку",
+  "Create space": "Створити простір",
+  "Create workspace": "Створити робочу область",
+  "Current password": "Поточний пароль",
+  "Dark": "Темна",
+  "Date": "Дата",
+  "Delete": "Видалити",
+  "Delete group": "Видалити групу",
+  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Ви впевнені, що хочете видалити цю сторінку? Це видалить її дочірні сторінки, а також історію сторінки. Ця дія необоротна.",
+  "Description": "Опис",
+  "Details": "Деталі",
+  "e.g ACME": "наприклад, ACME",
+  "e.g ACME Inc": "наприклад, ACME Inc",
+  "e.g Developers": "наприклад, Розробники",
+  "e.g Group for developers": "наприклад, Група для розробників",
+  "e.g product": "наприклад, продукт",
+  "e.g Product Team": "наприклад, Продуктова команда",
+  "e.g Sales": "наприклад, Продажі",
+  "e.g Space for product team": "наприклад, Простір для продуктової команди",
+  "e.g Space for sales team to collaborate": "наприклад, Простір для спільної роботи команди продажів",
+  "Edit": "Редагувати",
+  "Edit group": "Редагувати групу",
+  "Email": "Електронна пошта",
+  "Enter a strong password": "Введіть надійний пароль",
+  "Enter valid email addresses separated by comma or space max_50": "Введіть дійсні адреси електронної пошти, розділені комою або пробілом [макс: 50]",
+  "enter valid emails addresses": "введіть дійсні адреси електронної пошти",
+  "Enter your current password": "Введіть ваш поточний пароль",
+  "enter your full name": "введіть ваше повне ім'я",
+  "Enter your new password": "Введіть ваш новий пароль",
+  "Enter your new preferred email": "Введіть вашу нову бажану електронну пошту",
+  "Enter your password": "Введіть ваш пароль",
+  "Error fetching page data.": "Помилка при завантаженні даних сторінки.",
+  "Error loading page history.": "Помилка при завантаженні історії сторінки.",
+  "Export": "Експорт",
+  "Failed to create page": "Не вдалося створити сторінку",
+  "Failed to delete page": "Не вдалося видалити сторінку",
+  "Failed to fetch recent pages": "Не вдалося отримати нещодавні сторінки",
+  "Failed to import pages": "Не вдалося імпортувати сторінки",
+  "Failed to load page. An error occurred.": "Не вдалося завантажити сторінку. Сталася помилка.",
+  "Failed to update data": "Не вдалося оновити дані",
+  "Full access": "Повний доступ",
+  "Full page width": "Ширина на всю сторінку",
+  "Full width": "На всю ширину",
+  "General": "Загальні",
+  "Group": "Група",
+  "Group description": "Опис групи",
+  "Group name": "Назва групи",
+  "Groups": "Групи",
+  "Has full access to space settings and pages.": "Має повний доступ до налаштувань простору та сторінок.",
+  "Home": "Головна",
+  "Import pages": "Імпорт сторінок",
+  "Import pages & space settings": "Імпорт сторінок і налаштування простору",
+  "Importing pages": "Імпортування сторінок",
+  "invalid invitation link": "посилання на запрошення недійсне",
+  "Invitation signup": "Реєстрація за запрошенням",
+  "Invite by email": "Запросити електронною поштою",
+  "Invite members": "Запросити учасників",
+  "Invite new members": "Запросити нових учасників",
+  "Invited members who are yet to accept their invitation will appear here.": "Запрошені учасники, які ще не прийняли запрошення, з'являться тут.",
+  "Invited members will be granted access to spaces the groups can access": "Запрошені учасники отримають доступ до просторів, доступ до яких має група",
+  "Join the workspace": "Приєднатися до робочої області",
+  "Language": "Мова",
+  "Light": "Світла",
+  "Link copied": "Посилання скопійовано",
+  "Login": "Увійти",
+  "Logout": "Вийти",
+  "Manage Group": "Керування групою",
+  "Manage members": "Керування учасниками",
+  "member": "учасник",
+  "Member": "Учасник",
+  "members": "учасники",
+  "Members": "Учасники",
+  "My preferences": "Мої налаштування",
+  "My Profile": "Мій профіль",
+  "My profile": "Мій профіль",
+  "Name": "Ім'я",
+  "New email": "Нова електронна адреса",
+  "New page": "Нова сторінка",
+  "New password": "Новий пароль",
+  "No group found": "Групу не знайдено",
+  "No page history saved yet.": "Історія сторінок ще не збережена.",
+  "No pages yet": "Сторінок поки немає",
+  "No results found...": "Результати не знайдено...",
+  "No user found": "Користувача не знайдено",
+  "Overview": "Огляд",
+  "Owner": "Власник",
+  "page": "сторінка",
+  "Page deleted successfully": "Сторінку успішно видалено",
+  "Page history": "Історія сторінки",
+  "Page import is in progress. Please do not close this tab.": "Імпорт сторінки в процесі. Будь ласка, не закривайте цю вкладку.",
+  "Pages": "Сторінки",
+  "pages": "сторінки",
+  "Password": "Пароль",
+  "Password changed successfully": "Пароль успішно змінено",
+  "Pending": "В очікуванні",
+  "Please confirm your action": "Будь ласка, підтвердіть вашу дію",
+  "Preferences": "Налаштування",
+  "Print PDF": "Друк PDF",
+  "Profile": "Профіль",
+  "Recently updated": "Нещодавно оновлено",
+  "Remove": "Видалити",
+  "Remove group member": "Видалити учасника групи",
+  "Remove space member": "Видалити учасника простору",
+  "Restore": "Відновити",
+  "Role": "Роль",
+  "Save": "Зберегти",
+  "Search": "Пошук",
+  "Search for groups": "Пошук груп",
+  "Search for users": "Пошук користувачів",
+  "Search for users and groups": "Пошук користувачів та груп",
+  "Search...": "Пошук...",
+  "Select language": "Оберіть мову",
+  "Select role": "Оберіть роль",
+  "Select role to assign to all invited members": "Оберіть роль для всіх запрошених учасників",
+  "Select theme": "Оберіть тему",
+  "Send invitation": "Надіслати запрошення",
+  "Invitation sent": "Запрошення надіслано",
+  "Settings": "Налаштування",
+  "Setup workspace": "Налаштувати робочу область",
+  "Sign In": "Вхід",
+  "Sign Up": "Реєстрація",
+  "Slug": "Slug",
+  "Space": "Простір",
+  "Space description": "Опис простору",
+  "Space menu": "Меню простору",
+  "Space name": "Назва простору",
+  "Space settings": "Налаштування простору",
+  "Space slug": "Slug простору",
+  "Spaces": "Простори",
+  "Spaces you belong to": "Простори, до яких ви належите",
+  "No space found": "Простори не знайдено",
+  "Search for spaces": "Пошук просторів",
+  "Start typing to search...": "Почніть вводити для пошуку...",
+  "Status": "Статус",
+  "Successfully imported": "Успішно імпортовано",
+  "Successfully restored": "Успішно відновлено",
+  "System settings": "Системні налаштування",
+  "Theme": "Тема",
+  "To change your email, you have to enter your password and new email.": "Щоб змінити електронну пошту, вам потрібно ввести пароль і нову адресу.",
+  "Toggle full page width": "Перемкнути ширину на всю сторінку",
+  "Unable to import pages. Please try again.": "Не вдалося імпортувати сторінки. Будь ласка, спробуйте ще раз.",
+  "untitled": "без назви",
+  "Untitled": "Без назви",
+  "Updated successfully": "Оновлено успішно",
+  "User": "Користувач",
+  "Workspace": "Робоча область",
+  "Workspace Name": "Ім'я робочої області",
+  "Workspace settings": "Налаштування робочої області",
+  "You can change your password here.": "Ви можете змінити свій пароль тут.",
+  "Your Email": "Ваша електронна пошта",
+  "Your import is complete.": "Ваш імпорт завершено.",
+  "Your name": "Ваше ім'я",
+  "Your Name": "Ваше ім'я",
+  "Your password": "Ваш пароль",
+  "Your password must be a minimum of 8 characters.": "Ваш пароль повинен містити мінімум 8 символів.",
+  "Sidebar toggle": "Перемкнути бічну панель",
+  "Comments": "Коментарі",
+  "404 page not found": "404 сторінку не знайдено",
+  "Sorry, we can't find the page you are looking for.": "На жаль, ми не можемо знайти сторінку, яку ви шукаєте.",
+  "Take me back to homepage": "Повернутися на головну сторінку",
+  "Forgot password": "Забули пароль",
+  "Forgot your password?": "Забули пароль?",
+  "A password reset link has been sent to your email. Please check your inbox.": "Посилання для скидання пароля було надіслано на вашу електронну адресу. Будь ласка, перевірте вхідні повідомлення.",
+  "Send reset link": "Надіслати посилання для скидання",
+  "Password reset": "Скидання пароля",
+  "Your new password": "Ваш новий пароль",
+  "Set password": "Встановити пароль",
+  "Write a comment": "Написати коментар",
+  "Reply...": "Відповісти...",
+  "Error loading comments.": "Помилка при завантаженні коментарів.",
+  "No comments yet.": "Коментарів поки немає.",
+  "Edit comment": "Редагувати коментар",
+  "Delete comment": "Видалити коментар",
+  "Are you sure you want to delete this comment?": "Ви впевнені, що хочете видалити цей коментар?",
+  "Comment created successfully": "Коментар успішно створено",
+  "Error creating comment": "Помилка при створенні коментаря",
+  "Comment updated successfully": "Коментар успішно оновлено",
+  "Failed to update comment": "Не вдалося оновити коментар",
+  "Comment deleted successfully": "Коментар успішно видалено",
+  "Failed to delete comment": "Не вдалося видалити коментар",
+  "Comment resolved successfully": "Коментар успішно вирішено",
+  "Failed to resolve comment": "Не вдалося вирішити коментар",
+  "Revoke invitation": "Відкликати запрошення",
+  "Revoke": "Відкликати",
+  "Don't": "Ні",
+  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Ви впевнені, що хочете відкликати це запрошення? Користувач не зможе приєднатися до робочої області.",
+  "Resend invitation": "Надіслати запрошення повторно",
+  "Anyone with this link can join this workspace.": "Будь-хто, хто має це посилання, може приєднатися до цієї робочої області.",
+  "Invite link": "Посилання для запрошення",
+  "Copy": "Копіювати",
+  "Copied": "Скопійовано",
+  "Select a user": "Оберіть користувача",
+  "Select a group": "Оберіть групу",
+  "Export all pages and attachments in this space.": "Експортувати всі сторінки та вкладення в цьому просторі.",
+  "Delete space": "Видалити простір",
+  "Are you sure you want to delete this space?": "Ви впевнені, що хочете видалити цей простір?",
+  "Delete this space with all its pages and data.": "Видалити цей простір з усіма його сторінками та даними.",
+  "All pages, comments, attachments and permissions in this space will be deleted irreversibly.": "Усі сторінки, коментарі, вкладення та дозволи в цьому просторі будуть видалені безповоротно.",
+  "Confirm space name": "Підтвердіть назву простору",
+  "Type the space name <b>{{spaceName}}</b> to confirm your action.": "Введіть назву простору <b>{{spaceName}}</b>, щоб підтвердити вашу дію.",
+  "Format": "Формат",
+  "Include subpages": "Включити вкладені сторінки",
+  "Include attachments": "Включити вкладення",
+  "Select export format": "Виберіть формат експорту",
+  "Export failed:": "Експортування не вдалося:",
+  "export error": "помилка експорту",
+  "Export page": "Експорт сторінки",
+  "Export space": "Експорт простору",
+  "Export {{type}}": "Експорт {{type}}",
+  "File exceeds the {{limit}} attachment limit": "Файл перевищує ліміт вкладень {{limit}}",
+  "Align left": "По лівому краю",
+  "Align right": "По правому краю",
+  "Align center": "По центру",
+  "Justify": "По ширині",
+  "Merge cells": "Об'єднати комірки",
+  "Split cell": "Розділити комірку",
+  "Delete column": "Видалити стовпець",
+  "Delete row": "Видалити рядок",
+  "Add left column": "Додати стовпець ліворуч",
+  "Add right column": "Додати стовпець праворуч",
+  "Add row above": "Додати рядок вище",
+  "Add row below": "Додати рядок нижче",
+  "Delete table": "Видалити таблицю",
+  "Info": "Інформація",
+  "Success": "Успішно",
+  "Warning": "Попередження",
+  "Danger": "Важливо",
+  "Mermaid diagram error:": "Помилка діаграми Mermaid:",
+  "Invalid Mermaid diagram": "Неприпустима діаграма Mermaid",
+  "Double-click to edit Draw.io diagram": "Клацніть двічі для редагування діаграми Draw.io",
+  "Exit": "Вийти",
+  "Save & Exit": "Зберегти та вийти",
+  "Double-click to edit Excalidraw diagram": "Клацніть двічі для редагування діаграми Excalidraw",
+  "Paste link": "Вставити посилання",
+  "Edit link": "Редагувати посилання",
+  "Remove link": "Видалити посилання",
+  "Add link": "Додати посилання",
+  "Please enter a valid url": "Будь ласка, введіть коректний url",
+  "Empty equation": "Порожнє рівняння",
+  "Invalid equation": "Неприпустиме рівняння",
+  "Color": "Колір",
+  "Text color": "Колір тексту",
+  "Default": "За замовчуванням",
+  "Blue": "Синій",
+  "Green": "Зелений",
+  "Purple": "Фіолетовий",
+  "Red": "Червоний",
+  "Yellow": "Жовтий",
+  "Orange": "Помаранчевий",
+  "Pink": "Рожевий",
+  "Gray": "Сірий",
+  "Embed link": "Вбудоване посилання",
+  "Invalid {{provider}} embed link": "Невірне посилання для вбудовування {{provider}}",
+  "Embed {{provider}}": "Вбудувати {{provider}}",
+  "Enter {{provider}} link to embed": "Введіть посилання для вбудовування {{provider}}",
+  "Bold": "Жирний",
+  "Italic": "Курсив",
+  "Underline": "Підкреслений",
+  "Strike": "Закреслений",
+  "Code": "Код",
+  "Comment": "Коментар",
+  "Text": "Текст",
+  "Heading 1": "Заголовок 1",
+  "Heading 2": "Заголовок 2",
+  "Heading 3": "Заголовок 3",
+  "To-do List": "Список справ",
+  "Bullet List": "Маркований список",
+  "Numbered List": "Нумерований список",
+  "Blockquote": "Блок цитування",
+  "Just start typing with plain text.": "Просто почніть друкувати звичайний текст.",
+  "Track tasks with a to-do list.": "Відстежуйте завдання за допомогою списку справ.",
+  "Big section heading.": "Великий заголовок розділу.",
+  "Medium section heading.": "Середній заголовок розділу.",
+  "Small section heading.": "Малий заголовок розділу.",
+  "Create a simple bullet list.": "Створити простий маркований список.",
+  "Create a list with numbering.": "Створити нумерований список.",
+  "Create block quote.": "Створити блок цитування.",
+  "Insert code snippet.": "Вставити фрагмент коду.",
+  "Insert horizontal rule divider": "Вставити горизонтальний роздільник",
+  "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
+  "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
+  "Upload any file from your device.": "Завантажити будь-який файл з вашого пристрою.",
+  "Table": "Таблиця",
+  "Insert a table.": "Вставити таблицю.",
+  "Insert collapsible block.": "Вставити блок, що згортається.",
+  "Video": "Відео",
+  "Divider": "Роздільник",
+  "Quote": "Цитата",
+  "Image": "Зображення",
+  "File attachment": "Прикріплений файл",
+  "Toggle block": "Блок, що згортається",
+  "Callout": "Виноска",
+  "Insert callout notice.": "Вставити виноску з повідомленням.",
+  "Math inline": "Формула",
+  "Insert inline math equation.": "Вставити математичне рівняння в рядок.",
+  "Math block": "Блок формул",
+  "Insert math equation": "Вставити математичне рівняння",
+  "Mermaid diagram": "Діаграма Mermaid",
+  "Insert mermaid diagram": "Вставити діаграму Mermaid",
+  "Insert and design Drawio diagrams": "Вставити та розробити діаграми Draw.io",
+  "Insert current date": "Вставити поточну дату",
+  "Draw and sketch excalidraw diagrams": "Вставити та малювати діаграми Excalidraw",
+  "Multiple": "Декілька",
+  "Heading {{level}}": "Заголовок {{level}}",
+  "Toggle title": "Перемкнути заголовок",
+  "Write anything. Enter \"/\" for commands": "Почніть писати. Введіть \"/\" для списку команд",
+  "Names do not match": "Назви не співпадають",
+  "Today, {{time}}": "Сьогодні, {{time}}",
+  "Yesterday, {{time}}": "Вчора, {{time}}",
+  "Space created successfully": "Простір успішно створено",
+  "Space updated successfully": "Простір успішно оновлено",
+  "Space deleted successfully": "Простір успішно видалено",
+  "Members added successfully": "Учасників успішно додано",
+  "Member removed successfully": "Учасника успішно видалено",
+  "Member role updated successfully": "Роль учасника успішно оновлено",
+  "Created by: <b>{{creatorName}}</b>": "Автор: <b>{{creatorName}}</b>",
+  "Created at: {{time}}": "Дата створення: {{time}}",
+  "Edited by {{name}} {{time}}": "Змінено {{name}} {{time}}",
+  "Word count: {{wordCount}}": "Кількість слів: {{wordCount}}",
+  "Character count: {{characterCount}}": "Кількість символів: {{characterCount}}",
+  "New update": "Нове оновлення",
+  "{{latestVersion}} is available": "Доступна нова версія {{latestVersion}}",
+  "Delete member": "Видалити учасника",
+  "Member deleted successfully": "Учасника успішно видалено",
+  "Are you sure you want to delete this workspace member? This action is irreversible.": "Ви впевнені, що хочете видалити цього учасника робочої області? Ця дія незворотна.",
+  "Move": "Перемістити",
+  "Move page": "Перемістити сторінку",
+  "Move page to a different space.": "Перемістити сторінку в інший простір.",
+  "Real-time editor connection lost. Retrying...": "З'єднання з редактором у реальному часі втрачено. Повторна спроба...",
+  "Table of contents": "Зміст",
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Додайте заголовки (H1, H2, H3), щоб створити зміст.",
+  "Share": "Поділитися",
+  "Public sharing": "Публічний доступ",
+  "Shared by": "Поділився",
+  "Shared at": "Поділився в",
+  "Inherits public sharing from": "Успадковує публічний доступ від",
+  "Share to web": "Поділитися в інтернеті",
+  "Shared to web": "Розміщено в інтернеті",
+  "Anyone with the link can view this page": "Будь-хто, хто має посилання, може переглянути цю сторінку",
+  "Make this page publicly accessible": "Зробити цю сторінку загальнодоступною",
+  "Include sub-pages": "Включити підсторінки",
+  "Make sub-pages public too": "Зробити підсторінки також загальнодоступними",
+  "Allow search engines to index page": "Дозволити пошуковим системам індексувати сторінку",
+  "Open page": "Відкрити сторінку",
+  "Page": "Сторінка",
+  "Delete public share link": "Видалити посилання на публічний доступ",
+  "Delete share": "Видалити спільний доступ",
+  "Are you sure you want to delete this shared link?": "Ви впевнені, що хочете видалити це посилання спільного доступу?",
+  "Publicly shared pages from spaces you are a member of will appear here": "Публічні сторінки з просторів, учасником яких ви є, з'являться тут",
+  "Share deleted successfully": "Спільний доступ успішно видалено",
+  "Share not found": "Спільний доступ не знайдено",
+  "Failed to share page": "Не вдалося поділитися сторінкою",
+  "Copy page": "Копіювати сторінки",
+  "Copy page to a different space.": "Скопіювати сторінку в інший простір.",
+  "Page copied successfully": "Сторінку успішно скопійовано"
+}
--- a/apps/client/public/locales/zh-CN/translation.json
+++ b/apps/client/public/locales/zh-CN/translation.json
@ -383,5 +383,8 @@
  "Publicly shared pages from spaces you are a member of will appear here": "您所在空间的公开共享页面会显示在此处",
  "Share deleted successfully": "分享已成功删除",
  "Share not found": "未找到分享",
-  "Failed to share page": "页面分享失败"
+  "Failed to share page": "页面分享失败",
+  "Copy page": "复制页面",
+  "Copy page to a different space.": "将页面复制到不同的空间。",
+  "Page copied successfully": "页面复制成功"
 }
--- a/apps/client/src/ee/billing/components/billing-details.tsx
+++ b/apps/client/src/ee/billing/components/billing-details.tsx
@ -112,18 +112,58 @@ export default function BillingDetails() {
                fz="xs"
                className={classes.label}
              >
-                Total
-              </Text>
-              <Text fw={700} fz="lg">
-                {(billing.amount / 100) * billing.quantity}{" "}
-                {billing.currency.toUpperCase()}
-              </Text>
-              <Text c="dimmed" fz="sm">
-                ${billing.amount / 100} /user/{billing.interval}
+                Cost
              </Text>
+              {billing.billingScheme === "tiered" && (
+                <>
+                  <Text fw={700} fz="lg">
+                    ${billing.amount / 100} {billing.currency.toUpperCase()}
+                  </Text>
+                  <Text c="dimmed" fz="sm">
+                    per {billing.interval}
+                  </Text>
+                </>
+              )}
+
+              {billing.billingScheme !== "tiered" && (
+                <>
+                  <Text fw={700} fz="lg">
+                    {(billing.amount / 100) * billing.quantity}{" "}
+                    {billing.currency.toUpperCase()}
+                  </Text>
+                  <Text c="dimmed" fz="sm">
+                    ${billing.amount / 100} /user/{billing.interval}
+                  </Text>
+                </>
+              )}
            </div>
          </Group>
        </Paper>
+
+        {billing.billingScheme === "tiered" && billing.tieredUpTo && (
+          <Paper p="md" radius="md">
+            <Group justify="apart">
+              <div>
+                <Text
+                  c="dimmed"
+                  tt="uppercase"
+                  fw={700}
+                  fz="xs"
+                  className={classes.label}
+                >
+                  Current Tier
+                </Text>
+                <Text fw={700} fz="lg">
+                  For up to {billing.tieredUpTo} users
+                </Text>
+                {/*billing.tieredFlatAmount && (
+                  <Text c="dimmed" fz="sm">
+                  </Text>
+                )*/}
+              </div>
+            </Group>
+          </Paper>
+        )}
      </SimpleGrid>
    </div>
  );
--- a/apps/client/src/ee/billing/components/billing-plans.tsx
+++ b/apps/client/src/ee/billing/components/billing-plans.tsx
@ -2,24 +2,28 @@ import {
  Button,
  Card,
  List,
-  SegmentedControl,
  ThemeIcon,
  Title,
  Text,
  Group,
+  Select,
+  Container,
+  Stack,
+  Badge,
+  Flex,
+  Switch,
 } from "@mantine/core";
 import { useState } from "react";
 import { IconCheck } from "@tabler/icons-react";
-import { useBillingPlans } from "@/ee/billing/queries/billing-query.ts";
 import { getCheckoutLink } from "@/ee/billing/services/billing-service.ts";
+import { useBillingPlans } from "@/ee/billing/queries/billing-query.ts";

 export default function BillingPlans() {
  const { data: plans } = useBillingPlans();
-  const [interval, setInterval] = useState("yearly");
-
-  if (!plans) {
-    return null;
-  }
+  const [isAnnual, setIsAnnual] = useState(true);
+  const [selectedTierValue, setSelectedTierValue] = useState<string | null>(
+    null,
+  );

  const handleCheckout = async (priceId: string) => {
    try {
@ -32,84 +36,153 @@ export default function BillingPlans() {
    }
  };

+  if (!plans || plans.length === 0) {
+    return null;
+  }
+
+  const firstPlan = plans[0];
+
+  // Set initial tier value if not set
+  if (!selectedTierValue && firstPlan.pricingTiers.length > 0) {
+    setSelectedTierValue(firstPlan.pricingTiers[0].upTo.toString());
+    return null;
+  }
+
+  if (!selectedTierValue) {
+    return null;
+  }
+
+  const selectData = firstPlan.pricingTiers
+    .filter((tier) => !tier.custom)
+    .map((tier, index) => {
+      const prevMaxUsers =
+        index > 0 ? firstPlan.pricingTiers[index - 1].upTo : 0;
+      return {
+        value: tier.upTo.toString(),
+        label: `${prevMaxUsers + 1}-${tier.upTo} users`,
+      };
+    });
+
  return (
-    <Group justify="center" p="xl">
-      {plans.map((plan) => {
-        const price =
-          interval === "monthly" ? plan.price.monthly : plan.price.yearly;
-        const priceId = interval === "monthly" ? plan.monthlyId : plan.yearlyId;
-        const yearlyMonthPrice = parseInt(plan.price.yearly) / 12;
+    <Container size="xl" py="xl">
+      {/* Controls Section */}
+      <Stack gap="xl" mb="md">
+        {/* Team Size and Billing Controls */}
+        <Group justify="center" align="center" gap="sm">
+          <Select
+            label="Team size"
+            description="Select the number of users"
+            value={selectedTierValue}
+            onChange={setSelectedTierValue}
+            data={selectData}
+            w={250}
+            size="md"
+            allowDeselect={false}
+          />

-        return (
-          <Card
-            key={plan.name}
-            withBorder
-            radius="md"
-            shadow="sm"
-            p="xl"
-            w={300}
-          >
-            <SegmentedControl
-              value={interval}
-              onChange={setInterval}
-              fullWidth
-              data={[
-                { label: "Monthly", value: "monthly" },
-                { label: "Yearly (25% OFF)", value: "yearly" },
-              ]}
-            />
-
-            <Title order={3} ta="center" mt="sm" mb="xs">
-              {plan.name}
-            </Title>
-            <Text ta="center" size="lg" fw={700}>
-              {interval === "monthly" && (
-                <>
-                  ${price}{" "}
-                  <Text span size="sm" fw={500} c="dimmed">
-                    /user/month
-                  </Text>
-                </>
-              )}
-              {interval === "yearly" && (
-                <>
-                  ${yearlyMonthPrice}{" "}
-                  <Text span size="sm" fw={500} c="dimmed">
-                    /user/month
-                  </Text>
-                </>
-              )}
-              <br/>
-              <Text span ta="center" size="md" fw={500} c="dimmed">
-                billed {interval}
-              </Text>
-            </Text>
-
-            <Card.Section mt="lg">
-              <Button onClick={() => handleCheckout(priceId)} fullWidth>
-                Subscribe
-              </Button>
-            </Card.Section>
-
-            <Card.Section mt="md">
-              <List
-                spacing="xs"
+          <Group justify="center" align="start">
+            <Flex justify="center" gap="md" align="center">
+              <Text size="md">Monthly</Text>
+              <Switch
+                defaultChecked={isAnnual}
+                onChange={(event) => setIsAnnual(event.target.checked)}
                size="sm"
-                center
-                icon={
-                  <ThemeIcon variant="light" size={24} radius="xl">
-                    <IconCheck size={16} />
-                  </ThemeIcon>
-                }
-              >
-                {plan.features.map((feature, index) => (
-                  <List.Item key={index}>{feature}</List.Item>
-                ))}
-              </List>
-            </Card.Section>
-          </Card>
-        );
-      })}
-    </Group>
+              />
+              <Text size="md">
+                Annually
+                <Badge component="span" variant="light" color="blue">
+                  15% OFF
+                </Badge>
+              </Text>
+            </Flex>
+          </Group>
+        </Group>
+      </Stack>
+
+      {/* Plans Grid */}
+      <Group justify="center" gap="lg" align="stretch">
+        {plans.map((plan, index) => {
+          const tieredPlan = plan;
+          const planSelectedTier =
+            tieredPlan.pricingTiers.find(
+              (tier) => tier.upTo.toString() === selectedTierValue,
+            ) || tieredPlan.pricingTiers[0];
+
+          const price = isAnnual
+            ? planSelectedTier.yearly
+            : planSelectedTier.monthly;
+          const priceId = isAnnual ? plan.yearlyId : plan.monthlyId;
+
+          return (
+            <Card
+              key={plan.name}
+              withBorder
+              radius="lg"
+              shadow="sm"
+              p="xl"
+              w={350}
+              miw={300}
+              style={{
+                position: "relative",
+              }}
+            >
+              <Stack gap="lg">
+                {/* Plan Header */}
+                <Stack gap="xs">
+                  <Title order={3} size="h4">
+                    {plan.name}
+                  </Title>
+                  {plan.description && (
+                    <Text size="sm" c="dimmed">
+                      {plan.description}
+                    </Text>
+                  )}
+                </Stack>
+
+                {/* Pricing */}
+                <Stack gap="xs">
+                  <Group align="baseline" gap="xs">
+                    <Title order={1} size="h1">
+                      ${isAnnual ? (price / 12).toFixed(0) : price}
+                    </Title>
+                    <Text size="lg" c="dimmed">
+                      per {isAnnual ? "month" : "month"}
+                    </Text>
+                  </Group>
+                  {isAnnual && (
+                    <Text size="sm" c="dimmed">
+                      Billed annually
+                    </Text>
+                  )}
+                  <Text size="md" fw={500}>
+                    for up to {planSelectedTier.upTo} users
+                  </Text>
+                </Stack>
+
+                {/* CTA Button */}
+                <Button onClick={() => handleCheckout(priceId)} fullWidth>
+                  Upgrade
+                </Button>
+
+                {/* Features */}
+                <List
+                  spacing="xs"
+                  size="sm"
+                  icon={
+                    <ThemeIcon size={20} radius="xl">
+                      <IconCheck size={14} />
+                    </ThemeIcon>
+                  }
+                >
+                  {plan.features.map((feature, featureIndex) => (
+                    <List.Item key={featureIndex}>{feature}</List.Item>
+                  ))}
+                </List>
+              </Stack>
+            </Card>
+          );
+        })}
+      </Group>
+    </Container>
  );
 }
--- a/apps/client/src/ee/billing/types/billing.types.ts
+++ b/apps/client/src/ee/billing/types/billing.types.ts
@ -25,6 +25,11 @@ export interface IBilling {
  createdAt: Date;
  updatedAt: Date;
  deletedAt: Date;
+  billingScheme: string | null;
+  tieredUpTo: string | null;
+  tieredFlatAmount: number | null;
+  tieredUnitAmount: number | null;
+  planName: string | null;
 }

 export interface ICheckoutLink {
@ -42,9 +47,18 @@ export interface IBillingPlan {
  monthlyId: string;
  yearlyId: string;
  currency: string;
-  price: {
+  price?: {
    monthly: string;
    yearly: string;
  };
  features: string[];
+  billingScheme: string | null;
+  pricingTiers: PricingTier[];
+}
+
+interface PricingTier {
+  upTo: number;
+  monthly?: number;
+  yearly?: number;
+  custom?: boolean;
 }
--- a/apps/client/src/features/auth/components/invite-sign-up-form.tsx
+++ b/apps/client/src/features/auth/components/invite-sign-up-form.tsx
@ -18,6 +18,7 @@ import classes from "@/features/auth/components/auth.module.css";
 import { useGetInvitationQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts";
 import { useTranslation } from "react-i18next";
+import SsoLogin from "@/ee/components/sso-login.tsx";

 const formSchema = z.object({
  name: z.string().trim().min(1),
@ -71,39 +72,43 @@ export function InviteSignUpForm() {
          {t("Join the workspace")}
        </Title>

-        <Stack align="stretch" justify="center" gap="xl">
-          <form onSubmit={form.onSubmit(onSubmit)}>
-            <TextInput
-              id="name"
-              type="text"
-              label={t("Name")}
-              placeholder={t("enter your full name")}
-              variant="filled"
-              {...form.getInputProps("name")}
-            />
+        <SsoLogin />

-            <TextInput
-              id="email"
-              type="email"
-              label={t("Email")}
-              value={invitation.email}
-              disabled
-              variant="filled"
-              mt="md"
-            />
+        {!invitation.enforceSso && (
+          <Stack align="stretch" justify="center" gap="xl">
+            <form onSubmit={form.onSubmit(onSubmit)}>
+              <TextInput
+                id="name"
+                type="text"
+                label={t("Name")}
+                placeholder={t("enter your full name")}
+                variant="filled"
+                {...form.getInputProps("name")}
+              />

-            <PasswordInput
-              label={t("Password")}
-              placeholder={t("Your password")}
-              variant="filled"
-              mt="md"
-              {...form.getInputProps("password")}
-            />
-            <Button type="submit" fullWidth mt="xl" loading={isLoading}>
-              {t("Sign Up")}
-            </Button>
-          </form>
-        </Stack>
+              <TextInput
+                id="email"
+                type="email"
+                label={t("Email")}
+                value={invitation.email}
+                disabled
+                variant="filled"
+                mt="md"
+              />
+
+              <PasswordInput
+                label={t("Password")}
+                placeholder={t("Your password")}
+                variant="filled"
+                mt="md"
+                {...form.getInputProps("password")}
+              />
+              <Button type="submit" fullWidth mt="xl" loading={isLoading}>
+                {t("Sign Up")}
+              </Button>
+            </form>
+          </Stack>
+        )}
      </Box>
    </Container>
  );
--- a/apps/client/src/features/auth/components/setup-workspace-form.tsx
+++ b/apps/client/src/features/auth/components/setup-workspace-form.tsx
@ -21,7 +21,7 @@ import { Link } from "react-router-dom";
 import APP_ROUTE from "@/lib/app-route.ts";

 const formSchema = z.object({
-  workspaceName: z.string().trim().min(3).max(50),
+  workspaceName: z.string().trim().max(50).optional(),
  name: z.string().min(1).max(50),
  email: z
    .string()
@ -60,15 +60,17 @@ export function SetupWorkspaceForm() {
          {isCloud() && <SsoCloudSignup />}

          <form onSubmit={form.onSubmit(onSubmit)}>
-            <TextInput
-              id="workspaceName"
-              type="text"
-              label={t("Workspace Name")}
-              placeholder={t("e.g ACME Inc")}
-              variant="filled"
-              mt="md"
-              {...form.getInputProps("workspaceName")}
-            />
+            {!isCloud() && (
+              <TextInput
+                id="workspaceName"
+                type="text"
+                label={t("Workspace Name")}
+                placeholder={t("e.g ACME Inc")}
+                variant="filled"
+                mt="md"
+                {...form.getInputProps("workspaceName")}
+              />
+            )}

            <TextInput
              id="name"
--- a/apps/client/src/features/auth/types/auth.types.ts
+++ b/apps/client/src/features/auth/types/auth.types.ts
@ -10,7 +10,7 @@ export interface IRegister {
 }

 export interface ISetupWorkspace {
-  workspaceName: string;
+  workspaceName?: string;
  name: string;
  email: string;
  password: string;
@ -36,5 +36,5 @@ export interface IVerifyUserToken {
 }

 export interface ICollabToken {
-  token: string;
+  token?: string;
 }
--- a/apps/client/src/features/editor/components/bubble-menu/bubble-menu.tsx
+++ b/apps/client/src/features/editor/components/bubble-menu/bubble-menu.tsx
@ -116,6 +116,12 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
    },
    tippyOptions: {
      moveTransition: "transform 0.15s ease-out",
+      onCreate: (instance) => {
+        instance.popper.firstChild?.addEventListener("blur", (event) => {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+        });
+      },
      onHide: () => {
        setIsNodeSelectorOpen(false);
        setIsTextAlignmentOpen(false);
@ -177,8 +183,8 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
        <LinkSelector
          editor={props.editor}
          isOpen={isLinkSelectorOpen}
-          setIsOpen={() => {
-            setIsLinkSelectorOpen(!isLinkSelectorOpen);
+          setIsOpen={(value) => {
+            setIsLinkSelectorOpen(value);
            setIsNodeSelectorOpen(false);
            setIsTextAlignmentOpen(false);
            setIsColorSelectorOpen(false);
--- a/apps/client/src/features/editor/components/embed/embed-view.tsx
+++ b/apps/client/src/features/editor/components/embed/embed-view.tsx
@ -18,7 +18,10 @@ import { useForm, zodResolver } from "@mantine/form";
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
 import i18n from "i18next";
-import { getEmbedProviderById, getEmbedUrlAndProvider } from '@docmost/editor-ext';
+import {
+  getEmbedProviderById,
+  getEmbedUrlAndProvider,
+} from "@docmost/editor-ext";

 const schema = z.object({
  url: z
@ -29,7 +32,7 @@ const schema = z.object({

 export default function EmbedView(props: NodeViewProps) {
  const { t } = useTranslation();
-  const { node, selected, updateAttributes } = props;
+  const { node, selected, updateAttributes, editor } = props;
  const { src, provider } = node.attrs;

  const embedUrl = useMemo(() => {
@ -47,8 +50,16 @@ export default function EmbedView(props: NodeViewProps) {
  });

  async function onSubmit(data: { url: string }) {
+    if (!editor.isEditable) {
+      return;
+    }
+
    if (provider) {
      const embedProvider = getEmbedProviderById(provider);
+      if (embedProvider.id === "iframe") {
+        updateAttributes({ src: data.url });
+        return;
+      }
      if (embedProvider.regex.test(data.url)) {
        updateAttributes({ src: data.url });
      } else {
@ -78,7 +89,13 @@ export default function EmbedView(props: NodeViewProps) {
          </AspectRatio>
        </>
      ) : (
-        <Popover width={300} position="bottom" withArrow shadow="md">
+        <Popover
+          width={300}
+          position="bottom"
+          withArrow
+          shadow="md"
+          disabled={!editor.isEditable}
+        >
          <Popover.Target>
            <Card
              radius="md"
--- a/apps/client/src/features/editor/components/excalidraw/excalidraw-utils.ts
+++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-utils.ts
@ -0,0 +1,42 @@
+type LibraryItems = any;
+
+type LibraryPersistedData = {
+  libraryItems: LibraryItems;
+};
+
+export interface LibraryPersistenceAdapter {
+  load(metadata: { source: "load" | "save" }):
+    | Promise<{ libraryItems: LibraryItems } | null>
+    | {
+    libraryItems: LibraryItems;
+  }
+    | null;
+
+  save(libraryData: LibraryPersistedData): Promise<void> | void;
+}
+
+const LOCAL_STORAGE_KEY = "excalidrawLibrary";
+
+export const localStorageLibraryAdapter: LibraryPersistenceAdapter = {
+  async load() {
+    try {
+      const data = localStorage.getItem(LOCAL_STORAGE_KEY);
+      if (data) {
+        return JSON.parse(data);
+      }
+    } catch (e) {
+      console.error("Error downloading Excalidraw library from localStorage", e);
+    }
+    return null;
+  },
+  async save(libraryData) {
+    try {
+      localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(libraryData));
+    } catch (e) {
+      console.error(
+        "Error while saving library from Excalidraw to localStorage",
+        e,
+      );
+    }
+  },
+};
--- a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
+++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
@ -13,7 +13,8 @@ import { uploadFile } from "@/features/page/services/page-service.ts";
 import { svgStringToFile } from "@/lib";
 import { useDisclosure } from "@mantine/hooks";
 import { getFileUrl } from "@/lib/config.ts";
-import { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types/types";
+import "@excalidraw/excalidraw/index.css";
+import type { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types";
 import { IAttachment } from "@/lib/types";
 import ReactClearModal from "react-clear-modal";
 import clsx from "clsx";
@ -21,6 +22,8 @@ import { IconEdit } from "@tabler/icons-react";
 import { lazy } from "react";
 import { Suspense } from "react";
 import { useTranslation } from "react-i18next";
+import { useHandleLibrary } from "@excalidraw/excalidraw";
+import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";

 const Excalidraw = lazy(() =>
  import("@excalidraw/excalidraw").then((module) => ({
@ -35,6 +38,10 @@ export default function ExcalidrawView(props: NodeViewProps) {

  const [excalidrawAPI, setExcalidrawAPI] =
    useState<ExcalidrawImperativeAPI>(null);
+  useHandleLibrary({
+    excalidrawAPI,
+    adapter: localStorageLibraryAdapter,
+  });
  const [excalidrawData, setExcalidrawData] = useState<any>(null);
  const [opened, { open, close }] = useDisclosure(false);
  const computedColorScheme = useComputedColorScheme();
--- a/apps/client/src/features/editor/components/slash-menu/menu-items.ts
+++ b/apps/client/src/features/editor/components/slash-menu/menu-items.ts
@ -17,8 +17,8 @@ import {
  IconTable,
  IconTypography,
  IconMenu4,
-  IconCalendar,
-} from "@tabler/icons-react";
+  IconCalendar, IconAppWindow,
+} from '@tabler/icons-react';
 import {
  CommandProps,
  SlashMenuGroupedItemsType,
@ -357,6 +357,20 @@ const CommandGroups: SlashMenuGroupedItemsType = {
          .run();
      },
    },
+    {
+      title: "Iframe embed",
+      description: "Embed any Iframe",
+      searchTerms: ["iframe"],
+      icon: IconAppWindow,
+      command: ({ editor, range }: CommandProps) => {
+        editor
+          .chain()
+          .focus()
+          .deleteRange(range)
+          .setEmbed({ provider: "iframe" })
+          .run();
+      },
+    },
    {
      title: "Airtable",
      description: "Embed Airtable",
--- a/apps/client/src/features/editor/components/table/table-menu.tsx
+++ b/apps/client/src/features/editor/components/table/table-menu.tsx
@ -17,9 +17,9 @@ import {
  IconColumnRemove,
  IconRowInsertBottom,
  IconRowInsertTop,
-  IconRowRemove,
+  IconRowRemove, IconTableColumn, IconTableRow,
  IconTrashX,
-} from "@tabler/icons-react";
+} from '@tabler/icons-react';
 import { isCellSelection } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";

@ -50,6 +50,14 @@ export const TableMenu = React.memo(
      return posToDOMRect(editor.view, selection.from, selection.to);
    }, [editor]);

+    const toggleHeaderColumn = useCallback(() => {
+      editor.chain().focus().toggleHeaderColumn().run();
+    }, [editor]);
+
+    const toggleHeaderRow = useCallback(() => {
+      editor.chain().focus().toggleHeaderRow().run();
+    }, [editor]);
+
    const addColumnLeft = useCallback(() => {
      editor.chain().focus().addColumnBefore().run();
    }, [editor]);
@ -180,6 +188,30 @@ export const TableMenu = React.memo(
            </ActionIcon>
          </Tooltip>

+          <Tooltip position="top" label={t("Toggle header row")}
+          >
+            <ActionIcon
+              onClick={toggleHeaderRow}
+              variant="default"
+              size="lg"
+              aria-label={t("Toggle header row")}
+            >
+              <IconTableRow size={18} />
+            </ActionIcon>
+          </Tooltip>
+
+          <Tooltip position="top" label={t("Toggle header column")}
+          >
+            <ActionIcon
+              onClick={toggleHeaderColumn}
+              variant="default"
+              size="lg"
+              aria-label={t("Toggle header column")}
+            >
+              <IconTableColumn size={18} />
+            </ActionIcon>
+          </Tooltip>
+
          <Tooltip position="top" label={t("Delete table")}>
            <ActionIcon
              onClick={deleteTable}
--- a/apps/client/src/features/editor/extensions/extensions.ts
+++ b/apps/client/src/features/editor/extensions/extensions.ts
@ -73,6 +73,7 @@ import i18n from "@/i18n.ts";
 import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboard.ts";
 import EmojiCommand from "./emoji-command";
 import { CharacterCount } from "@tiptap/extension-character-count";
+import { countWords } from "alfaaz";

 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
@ -213,7 +214,9 @@ export const mainExtensions = [
  MarkdownClipboard.configure({
    transformPastedText: true,
  }),
-  CharacterCount
+  CharacterCount.configure({
+    wordCounter: (text) => countWords(text),
+  }),
 ] as any;

 type CollabExtensions = (provider: HocuspocusProvider, user: IUser) => any[];
--- a/apps/client/src/features/editor/full-editor.tsx
+++ b/apps/client/src/features/editor/full-editor.tsx
@ -42,7 +42,11 @@ export function FullEditor({
        spaceSlug={spaceSlug}
        editable={editable}
      />
-      <MemoizedPageEditor pageId={pageId} editable={editable} content={content} />
+      <MemoizedPageEditor
+        pageId={pageId}
+        editable={editable}
+        content={content}
+      />
    </Container>
  );
 }
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@ -52,6 +52,7 @@ import { IPage } from "@/features/page/types/page.types.ts";
 import { useParams } from "react-router-dom";
 import { extractPageSlugId } from "@/lib";
 import { FIVE_MINUTES } from "@/lib/constants.ts";
+import { PageEditMode } from "@/features/user/types/user.types.ts";
 import { jwtDecode } from "jwt-decode";

 interface PageEditorProps {
@ -85,6 +86,8 @@ export default function PageEditor({
  const [isCollabReady, setIsCollabReady] = useState(false);
  const { pageSlug } = useParams();
  const slugId = extractPageSlugId(pageSlug);
+  const userPageEditMode =
+    currentUser?.user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;

  const localProvider = useMemo(() => {
    const provider = new IndexeddbPersistence(documentName, ydoc);
@ -290,6 +293,17 @@ export default function PageEditor({
    return () => clearTimeout(collabReadyTimeout);
  }, [isRemoteSynced, isLocalSynced, remoteProvider?.status]);

+  useEffect(() => {
+    // honor user default page edit mode preference
+    if (userPageEditMode && editor && editable && isSynced) {
+      if (userPageEditMode === PageEditMode.Edit) {
+        editor.setEditable(true);
+      } else if (userPageEditMode === PageEditMode.Read) {
+        editor.setEditable(false);
+      }
+    }
+  }, [userPageEditMode, editor, editable, isSynced]);
+
  return isCollabReady ? (
    <div>
      <div ref={menuContainerRef}>
--- a/apps/client/src/features/editor/title-editor.tsx
+++ b/apps/client/src/features/editor/title-editor.tsx
@ -21,6 +21,8 @@ import { useTranslation } from "react-i18next";
 import EmojiCommand from "@/features/editor/extensions/emoji-command.ts";
 import { UpdateEvent } from "@/features/websocket/types";
 import localEmitter from "@/lib/local-emitter.ts";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { PageEditMode } from "@/features/user/types/user.types.ts";

 export interface TitleEditorProps {
  pageId: string;
@ -44,6 +46,9 @@ export function TitleEditor({
  const emit = useQueryEmit();
  const navigate = useNavigate();
  const [activePageId, setActivePageId] = useState(pageId);
+  const [currentUser] = useAtom(currentUserAtom);
+  const userPageEditMode =
+    currentUser?.user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;

  const titleEditor = useEditor({
    extensions: [
@ -136,9 +141,24 @@ export function TitleEditor({
    };
  }, [pageId]);

-  function handleTitleKeyDown(event) {
+  useEffect(() => {
+    // honor user default page edit mode preference
+    if (userPageEditMode && titleEditor && editable) {
+      if (userPageEditMode === PageEditMode.Edit) {
+        titleEditor.setEditable(true);
+      } else if (userPageEditMode === PageEditMode.Read) {
+        titleEditor.setEditable(false);
+      }
+    }
+  }, [userPageEditMode, titleEditor, editable]);
+
+  function handleTitleKeyDown(event: any) {
    if (!titleEditor || !pageEditor || event.shiftKey) return;
    
+    // Prevent focus shift when IME composition is active 
+    // `keyCode === 229` is added to support Safari where `isComposing` may not be reliable
+    if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return;
+    
    const { key } = event;
    const { $head } = titleEditor.state.selection;

--- a/apps/client/src/features/page-history/services/page-history-service.ts
+++ b/apps/client/src/features/page-history/services/page-history-service.ts
@ -1,9 +1,10 @@
 import api from "@/lib/api-client";
 import { IPageHistory } from "@/features/page-history/types/page.types";
+import { IPagination } from "@/lib/types.ts";

 export async function getPageHistoryList(
  pageId: string,
-): Promise<IPageHistory[]> {
+): Promise<IPagination<IPageHistory>> {
  const req = await api.post("/pages/history", {
    pageId,
  });
--- a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css
+++ b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css
@ -1,24 +1,30 @@
 .breadcrumbs {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  flex-wrap: nowrap;
+
+  a {
+    color: var(--mantine-color-default-color);
+    line-height: inherit;
+  }
+
+  .mantine-Breadcrumbs-breadcrumb {
+    min-width: 1px;
    overflow: hidden;
-    flex-wrap: nowrap;
-
-    a {
-        color: var(--mantine-color-default-color);
-        line-height: inherit;
-    }
-
-    .mantine-Breadcrumbs-breadcrumb {
-        min-width: 1px;
-        overflow: hidden;
-    }
+  }
 }

 .truncatedText {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 200px;
 }

+.breadcrumbDiv {
+  overflow: hidden;
+  @media (max-width: $mantine-breakpoint-sm) {
+    overflow: visible;
+  }
+}
--- a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx
+++ b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx
@ -161,7 +161,7 @@ export default function Breadcrumb() {
  };

  return (
-    <div style={{ overflow: "hidden" }}>
+    <div className={classes.breadcrumbDiv}>
      {breadcrumbNodes && (
        <Breadcrumbs className={classes.breadcrumbs}>
          {isMobile ? getMobileBreadcrumbItems() : getBreadcrumbItems()}
--- a/apps/client/src/features/page/components/header/page-header-menu.tsx
+++ b/apps/client/src/features/page/components/header/page-header-menu.tsx
@ -33,6 +33,7 @@ import {
  yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms.ts";
 import { formattedDate, timeAgo } from "@/lib/time.ts";
+import { PageStateSegmentedControl } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import ShareModal from "@/features/share/components/share-modal.tsx";
@ -59,6 +60,8 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
        </Tooltip>
      )}

+      {!readOnly && <PageStateSegmentedControl size="xs" />}
+
      <ShareModal readOnly={readOnly} />

      <Tooltip label={t("Comments")} openDelay={250} withArrow>
--- a/apps/client/src/features/page/components/header/page-header.module.css
+++ b/apps/client/src/features/page/components/header/page-header.module.css
@ -1,15 +1,27 @@
 .header {
-    height: 45px;
-    background-color: var(--mantine-color-body);
-    padding-left: var(--mantine-spacing-md);
-    padding-right: var(--mantine-spacing-md);
-    position: fixed;
-    z-index: 99;
-    top: var(--app-shell-header-offset, 0rem);
-    inset-inline-start: var(--app-shell-navbar-offset, 0rem);
-    inset-inline-end: var(--app-shell-aside-offset, 0rem);
+  height: 45px;
+  background-color: var(--mantine-color-body);
+  padding-left: var(--mantine-spacing-md);
+  padding-right: var(--mantine-spacing-md);
+  position: fixed;
+  z-index: 99;
+  top: var(--app-shell-header-offset, 0rem);
+  inset-inline-start: var(--app-shell-navbar-offset, 0rem);
+  inset-inline-end: var(--app-shell-aside-offset, 0rem);

-    @media print {
-        display: none;
-    }
+  @media (max-width: $mantine-breakpoint-sm) {
+    padding-left: var(--mantine-spacing-xs);
+    padding-right: var(--mantine-spacing-xs);
+  }
+
+  @media print {
+    display: none;
+  }
+}
+
+.group {
+  @media (max-width: $mantine-breakpoint-sm) {
+    gap: var(--mantine-spacing-sm);
+    padding-inline: 0 !important;
+  }
 }
--- a/apps/client/src/features/page/components/header/page-header.tsx
+++ b/apps/client/src/features/page/components/header/page-header.tsx
@ -9,10 +9,10 @@ interface Props {
 export default function PageHeader({ readOnly }: Props) {
  return (
    <div className={classes.header}>
-      <Group justify="space-between" h="100%" px="md" wrap="nowrap">
+      <Group justify="space-between" h="100%" px="md" wrap="nowrap" className={classes.group}>
        <Breadcrumb />

-        <Group justify="flex-end" h="100%" px="md" wrap="nowrap">
+        <Group justify="flex-end" h="100%" px="md" wrap="nowrap" gap="var(--mantine-spacing-xs)">
          <PageHeaderMenu readOnly={readOnly} />
        </Group>
      </Group>
--- a/apps/client/src/features/page/types/page.types.ts
+++ b/apps/client/src/features/page/types/page.types.ts
@ -65,6 +65,7 @@ export interface IPageInput {
  icon: string;
  coverPhoto: string;
  position: string;
+  isLocked: boolean;
 }

 export interface IExportPageParams {
--- a/apps/client/src/features/user/components/account-language.tsx
+++ b/apps/client/src/features/user/components/account-language.tsx
@ -42,14 +42,15 @@ function LanguageSwitcher() {
      label={t("Select language")}
      data={[
        { value: "en-US", label: "English (US)" },
-        { value: "de-DE", label: "Deutsch (German)" },
-        { value: "nl-NL", label: "Dutch (Netherlands)" },
-        { value: "fr-FR", label: "Français (French)" },
        { value: "es-ES", label: "Español (Spanish)" },
+        { value: "de-DE", label: "Deutsch (German)" },
+        { value: "fr-FR", label: "Français (French)" },
+        { value: "nl-NL", label: "Dutch (Netherlands)" },
        { value: "pt-BR", label: "Português (Brasil)" },
        { value: "it-IT", label: "Italiano (Italian)" },
        { value: "ja-JP", label: "日本語 (Japanese)" },
        { value: "ko-KR", label: "한국어 (Korean)" },
+        { value: "uk-UA", label: "Українська (Ukrainian)" },
        { value: "ru-RU", label: "Русский (Russian)" },
        { value: "zh-CN", label: "中文 (简体)" },
      ]}
--- a/apps/client/src/features/user/components/account-name-form.tsx
+++ b/apps/client/src/features/user/components/account-name-form.tsx
@ -11,7 +11,7 @@ import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";

 const formSchema = z.object({
-  name: z.string().min(2).max(40),
+  name: z.string().min(1).max(40),
 });

 type FormValues = z.infer<typeof formSchema>;
--- a/apps/client/src/features/user/components/page-state-pref.tsx
+++ b/apps/client/src/features/user/components/page-state-pref.tsx
@ -0,0 +1,65 @@
+import { Group, Text, MantineSize, SegmentedControl } from "@mantine/core";
+import { useAtom } from "jotai";
+import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { updateUser } from "@/features/user/services/user-service.ts";
+import React, { useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { PageEditMode } from "@/features/user/types/user.types.ts";
+
+export default function PageStatePref() {
+  const { t } = useTranslation();
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Text size="md">{t("Default page edit mode")}</Text>
+        <Text size="sm" c="dimmed">
+          {t("Choose your preferred page edit mode. Avoid accidental edits.")}
+        </Text>
+      </div>
+
+      <PageStateSegmentedControl />
+    </Group>
+  );
+}
+
+interface PageStateSegmentedControlProps {
+  size?: MantineSize;
+}
+
+export function PageStateSegmentedControl({
+  size,
+}: PageStateSegmentedControlProps) {
+  const { t } = useTranslation();
+  const [user, setUser] = useAtom(userAtom);
+  const pageEditMode =
+    user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
+  const [value, setValue] = useState(pageEditMode);
+
+  const handleChange = useCallback(
+    async (value: string) => {
+      const updatedUser = await updateUser({ pageEditMode: value });
+      setValue(value);
+      setUser(updatedUser);
+    },
+    [user, setUser],
+  );
+
+  useEffect(() => {
+    if (pageEditMode !== value) {
+      setValue(pageEditMode);
+    }
+  }, [pageEditMode, value]);
+
+  return (
+    <SegmentedControl
+      size={size}
+      value={value}
+      onChange={handleChange}
+      data={[
+        { label: t("Edit"), value: PageEditMode.Edit },
+        { label: t("Read"), value: PageEditMode.Read },
+      ]}
+    />
+  );
+}
--- a/apps/client/src/features/user/types/user.types.ts
+++ b/apps/client/src/features/user/types/user.types.ts
@ -19,6 +19,7 @@ export interface IUser {
  deactivatedAt: Date;
  deletedAt: Date;
  fullPageWidth: boolean; // used for update
+  pageEditMode: string; // used for update
 }

 export interface ICurrentUser {
@ -29,5 +30,11 @@ export interface ICurrentUser {
 export interface IUserSettings {
  preferences: {
    fullPageWidth: boolean;
+    pageEditMode: string;
  };
 }
+
+export enum PageEditMode {
+  Read = "read",
+  Edit = "edit",
+}
--- a/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
+++ b/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
@ -11,7 +11,7 @@ import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";

 const formSchema = z.object({
-  name: z.string().min(4),
+  name: z.string().min(1),
 });

 type FormValues = z.infer<typeof formSchema>;
--- a/apps/client/src/features/workspace/queries/workspace-query.ts
+++ b/apps/client/src/features/workspace/queries/workspace-query.ts
@ -173,7 +173,7 @@ export function useRevokeInvitationMutation() {

 export function useGetInvitationQuery(
  invitationId: string,
-): UseQueryResult<any, Error> {
+): UseQueryResult<IInvitation, Error> {
  return useQuery({
    queryKey: ["invitations", invitationId],
    queryFn: () => getInvitationById({ invitationId }),
--- a/apps/client/src/features/workspace/types/workspace.types.ts
+++ b/apps/client/src/features/workspace/types/workspace.types.ts
@ -35,6 +35,7 @@ export interface IInvitation {
  workspaceId: string;
  invitedById: string;
  createdAt: Date;
+  enforceSso: boolean;
 }

 export interface IInvitationLink {
--- a/apps/client/src/pages/page/page.tsx
+++ b/apps/client/src/pages/page/page.tsx
@ -12,6 +12,11 @@ import {
  SpaceCaslSubject,
 } from "@/features/space/permissions/permissions.type.ts";
 import { useTranslation } from "react-i18next";
+import React from "react";
+
+const MemoizedFullEditor = React.memo(FullEditor);
+const MemoizedPageHeader = React.memo(PageHeader);
+const MemoizedHistoryModal = React.memo(HistoryModal);

 export default function Page() {
  const { t } = useTranslation();
@ -49,14 +54,14 @@ export default function Page() {
          <title>{`${page?.icon || ""}  ${page?.title || t("untitled")}`}</title>
        </Helmet>

-        <PageHeader
+        <MemoizedPageHeader
          readOnly={spaceAbility.cannot(
            SpaceCaslAction.Manage,
            SpaceCaslSubject.Page,
          )}
        />

-        <FullEditor
+        <MemoizedFullEditor
          key={page.id}
          pageId={page.id}
          title={page.title}
@ -68,7 +73,7 @@ export default function Page() {
            SpaceCaslSubject.Page,
          )}
        />
-        <HistoryModal pageId={page.id} />
+        <MemoizedHistoryModal pageId={page.id} />
      </div>
    )
  );
--- a/apps/client/src/pages/settings/account/account-preferences.tsx
+++ b/apps/client/src/pages/settings/account/account-preferences.tsx
@ -2,6 +2,7 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
 import AccountLanguage from "@/features/user/components/account-language.tsx";
 import AccountTheme from "@/features/user/components/account-theme.tsx";
 import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
+import PageEditPref from "@/features/user/components/page-state-pref";
 import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
 import { Helmet } from "react-helmet-async";
@ -28,6 +29,10 @@ export default function AccountPreferences() {
      <Divider my={"md"} />

      <PageWidthPref />
+      
+      <Divider my={"md"} />
+
+      <PageEditPref />
    </>
  );
 }
--- a/apps/server/package.json
+++ b/apps/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "server",
-  "version": "0.20.4",
+  "version": "0.21.0",
  "description": "",
  "author": "",
  "private": true,
@ -36,54 +36,54 @@
    "@casl/ability": "^6.7.3",
    "@fastify/cookie": "^11.0.2",
    "@fastify/multipart": "^9.0.3",
-    "@fastify/static": "^8.1.1",
+    "@fastify/static": "^8.2.0",
    "@nestjs/bullmq": "^11.0.2",
-    "@nestjs/common": "^11.0.20",
+    "@nestjs/common": "^11.1.3",
    "@nestjs/config": "^4.0.2",
-    "@nestjs/core": "^11.0.20",
-    "@nestjs/event-emitter": "^3.0.0",
+    "@nestjs/core": "^11.1.3",
+    "@nestjs/event-emitter": "^3.0.1",
    "@nestjs/jwt": "^11.0.0",
    "@nestjs/mapped-types": "^2.1.0",
    "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-fastify": "^11.0.20",
-    "@nestjs/platform-socket.io": "^11.0.20",
-    "@nestjs/schedule": "^5.0.1",
+    "@nestjs/platform-fastify": "^11.1.3",
+    "@nestjs/platform-socket.io": "^11.1.3",
+    "@nestjs/schedule": "^6.0.0",
    "@nestjs/terminus": "^11.0.0",
-    "@nestjs/websockets": "^11.0.20",
+    "@nestjs/websockets": "^11.1.3",
    "@node-saml/passport-saml": "^5.0.1",
    "@react-email/components": "0.0.28",
    "@react-email/render": "1.0.2",
    "@socket.io/redis-adapter": "^8.3.0",
    "bcrypt": "^5.1.1",
-    "bullmq": "^5.41.3",
-    "cache-manager": "^6.4.0",
-    "cheerio": "^1.0.0",
+    "bullmq": "^5.53.2",
+    "cache-manager": "^6.4.3",
+    "cheerio": "^1.1.0",
    "class-transformer": "^0.5.1",
    "class-validator": "^0.14.1",
    "cookie": "^1.0.2",
    "fs-extra": "^11.3.0",
    "happy-dom": "^15.11.6",
    "jsonwebtoken": "^9.0.2",
-    "kysely": "^0.27.5",
+    "kysely": "^0.28.2",
    "kysely-migration-cli": "^0.4.2",
    "mime-types": "^2.1.35",
    "nanoid": "3.3.11",
-    "nestjs-kysely": "^1.1.0",
-    "nodemailer": "^6.10.0",
+    "nestjs-kysely": "^1.2.0",
+    "nodemailer": "^7.0.3",
    "openid-client": "^5.7.1",
    "passport-google-oauth20": "^2.0.0",
    "passport-jwt": "^4.0.1",
-    "pg": "^8.13.3",
+    "pg": "^8.16.0",
    "pg-tsquery": "^8.4.2",
    "postmark": "^4.0.5",
    "react": "^18.3.1",
    "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1",
+    "rxjs": "^7.8.2",
    "sanitize-filename-ts": "^1.0.2",
    "socket.io": "^4.8.1",
    "stripe": "^17.5.0",
    "tmp-promise": "^3.0.3",
-    "ws": "^8.18.0",
+    "ws": "^8.18.2",
    "yauzl": "^3.2.0"
  },
  "devDependencies": {
--- a/apps/server/src/common/helpers/utils.ts
+++ b/apps/server/src/common/helpers/utils.ts
@ -16,6 +16,12 @@ export async function comparePasswordHash(
  return bcrypt.compare(plainPassword, passwordHash);
 }

+export function generateRandomSuffixNumbers(length: number) {
+  return Math.random()
+    .toFixed(length)
+    .substring(2, 2 + length);
+}
+
 export type RedisConfig = {
  host: string;
  port: number;
--- a/apps/server/src/core/auth/auth.controller.ts
+++ b/apps/server/src/core/auth/auth.controller.ts
@ -1,11 +1,9 @@
 import {
-  BadRequestException,
  Body,
  Controller,
  HttpCode,
  HttpStatus,
  Post,
-  Req,
  Res,
  UseGuards,
 } from '@nestjs/common';
@ -23,7 +21,6 @@ import { ForgotPasswordDto } from './dto/forgot-password.dto';
 import { PasswordResetDto } from './dto/password-reset.dto';
 import { VerifyUserTokenDto } from './dto/verify-user-token.dto';
 import { FastifyReply } from 'fastify';
-import { addDays } from 'date-fns';
 import { validateSsoEnforcement } from './auth.util';

@Controller('auth')
@ -125,7 +122,7 @@ export class AuthController {
    res.setCookie('authToken', token, {
      httpOnly: true,
      path: '/',
-      expires: addDays(new Date(), 30),
+      expires: this.environmentService.getCookieExpiresIn(),
      secure: this.environmentService.isHttps(),
    });
  }
--- a/apps/server/src/core/auth/auth.util.ts
+++ b/apps/server/src/core/auth/auth.util.ts
@ -6,3 +6,16 @@ export function validateSsoEnforcement(workspace: Workspace) {
    throw new BadRequestException('This workspace has enforced SSO login.');
  }
 }
+
+export function validateAllowedEmail(userEmail: string, workspace: Workspace) {
+  const emailParts = userEmail.split('@');
+  const emailDomain = emailParts[1].toLowerCase();
+  if (
+    workspace.emailDomains?.length > 0 &&
+    !workspace.emailDomains.includes(emailDomain)
+  ) {
+    throw new BadRequestException(
+      `The email domain "${emailDomain}" is not approved for this workspace.`,
+    );
+  }
+}
--- a/apps/server/src/core/auth/dto/create-admin-user.dto.ts
+++ b/apps/server/src/core/auth/dto/create-admin-user.dto.ts
@ -1,6 +1,12 @@
-import { IsNotEmpty, IsString, MaxLength, MinLength } from 'class-validator';
+import {
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  MaxLength,
+  MinLength,
+} from 'class-validator';
 import { CreateUserDto } from './create-user.dto';
-import {Transform, TransformFnParams} from "class-transformer";
+import { Transform, TransformFnParams } from 'class-transformer';

 export class CreateAdminUserDto extends CreateUserDto {
  @IsNotEmpty()
@ -9,10 +15,17 @@ export class CreateAdminUserDto extends CreateUserDto {
  @Transform(({ value }: TransformFnParams) => value?.trim())
  name: string;

-  @IsNotEmpty()
-  @MinLength(3)
+  @IsOptional()
+  @MinLength(1)
  @MaxLength(50)
  @IsString()
  @Transform(({ value }: TransformFnParams) => value?.trim())
  workspaceName: string;
+
+  @IsOptional()
+  @MinLength(4)
+  @MaxLength(50)
+  @IsString()
+  @Transform(({ value }: TransformFnParams) => value?.trim())
+  hostname?: string;
 }
--- a/apps/server/src/core/auth/services/signup.service.ts
+++ b/apps/server/src/core/auth/services/signup.service.ts
@ -92,7 +92,8 @@ export class SignupService {

        // create workspace with full setup
        const workspaceData: CreateWorkspaceDto = {
-          name: createAdminUserDto.workspaceName,
+          name: createAdminUserDto.workspaceName || 'My workspace',
+          hostname: createAdminUserDto.hostname,
        };

        workspace = await this.workspaceService.create(
--- a/apps/server/src/core/user/dto/update-user.dto.ts
+++ b/apps/server/src/core/user/dto/update-user.dto.ts
@ -1,5 +1,5 @@
 import { OmitType, PartialType } from '@nestjs/mapped-types';
-import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import { IsBoolean, IsIn, IsOptional, IsString } from 'class-validator';
 import { CreateUserDto } from '../../auth/dto/create-user.dto';

 export class UpdateUserDto extends PartialType(
@ -13,6 +13,11 @@ export class UpdateUserDto extends PartialType(
  @IsBoolean()
  fullPageWidth: boolean;

+  @IsOptional()
+  @IsString()
+  @IsIn(['read', 'edit'])
+  pageEditMode: string;
+
  @IsOptional()
  @IsString()
  locale: string;
--- a/apps/server/src/core/user/user.service.ts
+++ b/apps/server/src/core/user/user.service.ts
@ -34,6 +34,14 @@ export class UserService {
      );
    }

+    if (typeof updateUserDto.pageEditMode !== 'undefined') {
+      return this.userRepo.updatePreference(
+        userId,
+        'pageEditMode',
+        updateUserDto.pageEditMode.toLowerCase(),
+      );
+    }
+
    if (updateUserDto.name) {
      user.name = updateUserDto.name;
    }
--- a/apps/server/src/core/workspace/controllers/workspace.controller.ts
+++ b/apps/server/src/core/workspace/controllers/workspace.controller.ts
@ -29,9 +29,7 @@ import WorkspaceAbilityFactory from '../../casl/abilities/workspace-ability.fact
 import {
  WorkspaceCaslAction,
  WorkspaceCaslSubject,
-} from '../../casl/interfaces/workspace-ability.type';
-import { addDays } from 'date-fns';
-import { FastifyReply } from 'fastify';
+} from '../../casl/interfaces/workspace-ability.type';import { FastifyReply } from 'fastify';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
 import { CheckHostnameDto } from '../dto/check-hostname.dto';
 import { RemoveWorkspaceUserDto } from '../dto/remove-workspace-user.dto';
@ -180,10 +178,13 @@ export class WorkspaceController {
  @Public()
  @HttpCode(HttpStatus.OK)
  @Post('invites/info')
-  async getInvitationById(@Body() dto: InvitationIdDto, @Req() req: any) {
+  async getInvitationById(
+    @Body() dto: InvitationIdDto,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
    return this.workspaceInvitationService.getInvitationById(
      dto.invitationId,
-      req.raw.workspaceId,
+      workspace,
    );
  }

@ -253,18 +254,18 @@ export class WorkspaceController {
  @Post('invites/accept')
  async acceptInvite(
    @Body() acceptInviteDto: AcceptInviteDto,
-    @Req() req: any,
+    @AuthWorkspace() workspace: Workspace,
    @Res({ passthrough: true }) res: FastifyReply,
  ) {
    const authToken = await this.workspaceInvitationService.acceptInvitation(
      acceptInviteDto,
-      req.raw.workspaceId,
+      workspace,
    );

    res.setCookie('authToken', authToken, {
      httpOnly: true,
      path: '/',
-      expires: addDays(new Date(), 30),
+      expires: this.environmentService.getCookieExpiresIn(),
      secure: this.environmentService.isHttps(),
    });
  }
--- a/apps/server/src/core/workspace/services/workspace-invitation.service.ts
+++ b/apps/server/src/core/workspace/services/workspace-invitation.service.ts
@ -28,6 +28,10 @@ import { InjectQueue } from '@nestjs/bullmq';
 import { QueueJob, QueueName } from '../../../integrations/queue/constants';
 import { Queue } from 'bullmq';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
+import {
+  validateAllowedEmail,
+  validateSsoEnforcement,
+} from '../../auth/auth.util';

@Injectable()
 export class WorkspaceInvitationService {
@ -63,19 +67,19 @@ export class WorkspaceInvitationService {
    return result;
  }

-  async getInvitationById(invitationId: string, workspaceId: string) {
+  async getInvitationById(invitationId: string, workspace: Workspace) {
    const invitation = await this.db
      .selectFrom('workspaceInvitations')
      .select(['id', 'email', 'createdAt'])
      .where('id', '=', invitationId)
-      .where('workspaceId', '=', workspaceId)
+      .where('workspaceId', '=', workspace.id)
      .executeTakeFirst();

    if (!invitation) {
      throw new NotFoundException('Invitation not found');
    }

-    return invitation;
+    return { ...invitation, enforceSso: workspace.enforceSso };
  }

  async getInvitationTokenById(invitationId: string, workspaceId: string) {
@ -141,6 +145,10 @@ export class WorkspaceInvitationService {
          groupIds: validGroups?.map((group: Partial<Group>) => group.id),
        }));

+        if (invitesToInsert.length < 1) {
+          return;
+        }
+
        invites = await trx
          .insertInto('workspaceInvitations')
          .values(invitesToInsert)
@ -169,12 +177,12 @@ export class WorkspaceInvitationService {
    }
  }

-  async acceptInvitation(dto: AcceptInviteDto, workspaceId: string) {
+  async acceptInvitation(dto: AcceptInviteDto, workspace: Workspace) {
    const invitation = await this.db
      .selectFrom('workspaceInvitations')
      .selectAll()
      .where('id', '=', dto.invitationId)
-      .where('workspaceId', '=', workspaceId)
+      .where('workspaceId', '=', workspace.id)
      .executeTakeFirst();

    if (!invitation) {
@ -185,6 +193,9 @@ export class WorkspaceInvitationService {
      throw new BadRequestException('Invalid invitation token');
    }

+    validateSsoEnforcement(workspace);
+    validateAllowedEmail(invitation.email, workspace);
+
    let newUser: User;

    try {
@ -197,7 +208,7 @@ export class WorkspaceInvitationService {
            password: dto.password,
            role: invitation.role,
            invitedById: invitation.invitedById,
-            workspaceId: workspaceId,
+            workspaceId: workspace.id,
          },
          trx,
        );
@ -205,7 +216,7 @@ export class WorkspaceInvitationService {
        // add user to default group
        await this.groupUserRepo.addUserToDefaultGroup(
          newUser.id,
-          workspaceId,
+          workspace.id,
          trx,
        );

@ -215,7 +226,7 @@ export class WorkspaceInvitationService {
            .selectFrom('groups')
            .select(['id', 'name'])
            .where('groups.id', 'in', invitation.groupIds)
-            .where('groups.workspaceId', '=', workspaceId)
+            .where('groups.workspaceId', '=', workspace.id)
            .execute();

          if (validGroups && validGroups.length > 0) {
@ -256,7 +267,7 @@ export class WorkspaceInvitationService {
    // notify the inviter
    const invitedByUser = await this.userRepo.findById(
      invitation.invitedById,
-      workspaceId,
+      workspace.id,
    );

    if (invitedByUser) {
@ -273,7 +284,9 @@ export class WorkspaceInvitationService {
    }

    if (this.environmentService.isCloud()) {
-      await this.billingQueue.add(QueueJob.STRIPE_SEATS_SYNC, { workspaceId });
+      await this.billingQueue.add(QueueJob.STRIPE_SEATS_SYNC, {
+        workspaceId: workspace.id,
+      });
    }

    return this.tokenService.generateAccessToken(newUser);
--- a/apps/server/src/core/workspace/services/workspace.service.ts
+++ b/apps/server/src/core/workspace/services/workspace.service.ts
@ -32,6 +32,7 @@ import { AttachmentType } from 'src/core/attachment/attachment.constants';
 import { InjectQueue } from '@nestjs/bullmq';
 import { QueueJob, QueueName } from '../../../integrations/queue/constants';
 import { Queue } from 'bullmq';
+import { generateRandomSuffixNumbers } from '../../../common/helpers';

@Injectable()
 export class WorkspaceService {
@ -377,24 +378,20 @@ export class WorkspaceService {
    name: string,
    trx?: KyselyTransaction,
  ): Promise<string> {
-    const generateRandomSuffix = (length: number) =>
-      Math.random()
-        .toFixed(length)
-        .substring(2, 2 + length);
-
    let subdomain = name
      .toLowerCase()
-      .replace(/[^a-z0-9]/g, '')
-      .substring(0, 20);
+      .replace(/[^a-z0-9-]/g, '')
+      .substring(0, 20)
+      .replace(/^-+|-+$/g, ''); //remove any hyphen at the start or end
    // Ensure we leave room for a random suffix.
    const maxSuffixLength = 6;

    if (subdomain.length < 4) {
-      subdomain = `${subdomain}-${generateRandomSuffix(maxSuffixLength)}`;
+      subdomain = `${subdomain}-${generateRandomSuffixNumbers(maxSuffixLength)}`;
    }

    if (DISALLOWED_HOSTNAMES.includes(subdomain)) {
-      subdomain = `workspace-${generateRandomSuffix(maxSuffixLength)}`;
+      subdomain = `workspace-${generateRandomSuffixNumbers(maxSuffixLength)}`;
    }

    let uniqueHostname = subdomain;
@ -408,7 +405,7 @@ export class WorkspaceService {
        break;
      }
      // Append a random suffix and retry.
-      const randomSuffix = generateRandomSuffix(maxSuffixLength);
+      const randomSuffix = generateRandomSuffixNumbers(maxSuffixLength);
      uniqueHostname = `${subdomain}-${randomSuffix}`.substring(0, 25);
    }

--- a/apps/server/src/database/migrations/20250623T215045-more-billing-columns.ts
+++ b/apps/server/src/database/migrations/20250623T215045-more-billing-columns.ts
@ -0,0 +1,23 @@
+import { type Kysely } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('billing')
+    .addColumn('billing_scheme', 'varchar', (col) => col)
+    .addColumn('tiered_up_to', 'varchar', (col) => col)
+    .addColumn('tiered_flat_amount', 'int8', (col) => col)
+    .addColumn('tiered_unit_amount', 'int8', (col) => col)
+    .addColumn('plan_name', 'varchar', (col) => col)
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('billing')
+    .dropColumn('billing_scheme')
+    .dropColumn('tiered_up_to')
+    .dropColumn('tiered_flat_amount')
+    .dropColumn('tiered_unit_amount')
+    .dropColumn('plan_name')
+    .execute();
+}
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@ -84,6 +84,7 @@ export interface Backlinks {

 export interface Billing {
  amount: Int8 | null;
+  billingScheme: string | null;
  cancelAt: Timestamp | null;
  cancelAtPeriodEnd: boolean | null;
  canceledAt: Timestamp | null;
@ -96,6 +97,7 @@ export interface Billing {
  metadata: Json | null;
  periodEndAt: Timestamp | null;
  periodStartAt: Timestamp;
+  planName: string | null;
  quantity: Int8 | null;
  status: string;
  stripeCustomerId: string | null;
@ -103,6 +105,9 @@ export interface Billing {
  stripePriceId: string | null;
  stripeProductId: string | null;
  stripeSubscriptionId: string;
+  tieredFlatAmount: Int8 | null;
+  tieredUnitAmount: Int8 | null;
+  tieredUpTo: string | null;
  updatedAt: Generated<Timestamp>;
  workspaceId: string;
 }
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
--- a/apps/server/src/integrations/environment/environment.service.ts
+++ b/apps/server/src/integrations/environment/environment.service.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import ms, { StringValue } from 'ms';

@Injectable()
 export class EnvironmentService {
@ -56,7 +57,18 @@ export class EnvironmentService {
  }

  getJwtTokenExpiresIn(): string {
-    return this.configService.get<string>('JWT_TOKEN_EXPIRES_IN', '30d');
+    return this.configService.get<string>('JWT_TOKEN_EXPIRES_IN', '90d');
+  }
+
+  getCookieExpiresIn(): Date {
+    const expiresInStr = this.getJwtTokenExpiresIn();
+    let msUntilExpiry: number;
+    try {
+      msUntilExpiry = ms(expiresInStr as StringValue);
+    } catch (err) {
+      msUntilExpiry = ms('90d');
+    }
+    return new Date(Date.now() + msUntilExpiry);
  }

  getStorageDriver(): string {
--- a/apps/server/src/integrations/static/static.module.ts
+++ b/apps/server/src/integrations/static/static.module.ts
@ -37,6 +37,8 @@ export class StaticModule implements OnModuleInit {
        CLOUD: this.environmentService.isCloud(),
        FILE_UPLOAD_SIZE_LIMIT:
          this.environmentService.getFileUploadSizeLimit(),
+        FILE_IMPORT_SIZE_LIMIT:
+          this.environmentService.getFileImportSizeLimit(),
        DRAWIO_URL: this.environmentService.getDrawioUrl(),
        SUBDOMAIN_HOST: this.environmentService.isCloud()
          ? this.environmentService.getSubdomainHost()
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "docmost",
  "homepage": "https://docmost.com",
-  "version": "0.20.4",
+  "version": "0.21.0",
  "private": true,
  "scripts": {
    "build": "nx run-many -t build",
@ -63,15 +63,16 @@
    "bytes": "^3.1.2",
    "cross-env": "^7.0.3",
    "date-fns": "^4.1.0",
-    "dompurify": "^3.2.4",
+    "dompurify": "^3.2.6",
    "fractional-indexing-jittered": "^1.0.0",
    "ioredis": "^5.4.1",
    "jszip": "^3.10.1",
    "linkifyjs": "^4.2.0",
-    "marked": "^13.0.3",
+    "marked": "13.0.3",
+    "ms": "3.0.0-canary.1",
    "uuid": "^11.1.0",
    "y-indexeddb": "^9.0.12",
-    "yjs": "^13.6.20"
+    "yjs": "^13.6.27"
  },
  "devDependencies": {
    "@nx/js": "20.4.5",
--- a/packages/editor-ext/src/lib/embed-provider.ts
+++ b/packages/editor-ext/src/lib/embed-provider.ts
@ -104,6 +104,14 @@ export const embedProviders: IEmbedProvider[] = [
      return url;
    },
  },
+  {
+    id: "iframe",
+    name: "Iframe",
+    regex: /any-iframe/,
+    getEmbedUrl: (match, url) => {
+      return url;
+    },
+  },
 ];

 export function getEmbedProviderById(id: string) {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Philipinho	9a16780d9f	custom tier	2025-06-24 04:42:09 -07:00
Philipinho	5fb90527ad	feat: tiered billing (cloud)	2025-06-24 04:21:38 -07:00
Philipinho	65b01038d7	v0.21.0	2025-06-18 14:28:14 -07:00
Philipinho	e07cb57b01	sync	2025-06-18 14:25:40 -07:00
Philipinho	2b53e0a455	fix: add import size limit to static window config	2025-06-18 13:58:41 -07:00
Auxa	b9b3406b28	Fix: Prevent premature focus change in TitleEditor when pressing Enter during IME composition (#730 ) * fix: Prevents key events during text composition Stops handling title key events when composing text, ensuring proper input behavior during IME use. * Refines IME composition event checks Separates IME composition control from shift key logic and adds a Safari-specific keyCode check to prevent premature focus shifts during IME input.	2025-06-18 21:33:35 +01:00
Philip Okugbe	728cac0a34	fix word counter (#1269 )	2025-06-18 21:32:11 +01:00
Philipinho	d35e16010b	handle empty invitation	2025-06-18 13:10:32 -07:00
Philipinho	15791d4e59	sync	2025-06-18 12:50:43 -07:00
Philip Okugbe	3318e13225	fix: use JWT expiry time for cookie duration (#1268 ) * Set default jwt expiry to 90 days.	2025-06-18 20:50:11 +01:00
Philipinho	080900610d	cleanup	2025-06-17 16:14:06 -07:00
fuscodev	d1dc6977ab	feat: edit mode preference (#666 ) * lock/unlock pages * remove using isLocked column - add default page edit state preference * * Move state management to editors (avoids flickers on edit mode switch) * Rename variables * Add strings to translation file * Memoize components in page component * Fix title editor sending update request on editable state change * fixed errors merging main * Fix embed view in read-only mode * remove unused line * sync * fix responsiveness on mobile --------- Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>	2025-06-18 00:11:47 +01:00
Philip Okugbe	5f62448894	less create workspace form fields in cloud (#1265 ) * sync * less signup form fields in cloud * min length	2025-06-17 23:56:07 +01:00
Philip Okugbe	44445fbf46	fix: enforce SSO in invitation signups (#1258 )	2025-06-15 20:25:15 +01:00
Philip Okugbe	1c674efddd	fix: revert tiptap version (#1255 )	2025-06-13 21:38:49 +01:00
Philip Okugbe	ccf7e34e99	feat: ukrainian language support (#1250 )	2025-06-11 23:31:45 +01:00
Philip Okugbe	f39d48d6ee	New Crowdin updates (#1063 ) * New translations translation.json	2025-06-11 23:21:01 +01:00
Philip Okugbe	f584ea84b0	chore: upgrade packages (#1242 ) * upgrade tiptap editor extensions * upgrade packages * fix type issue	2025-06-11 23:18:39 +01:00
Chai	bc0c4d6258	fix: make link popup work on safari (#1243 ) * fix: make link popup work on safari * fix: second iteration * chore: cleanup * chore: format * chore: undo unused stuff	2025-06-11 23:09:59 +01:00
Philip Okugbe	d8da307a61	feat: enhance excalidraw (#1240 ) * WIP * use next excalidraw version * support local persistence for excalidraw library. Co-authored-by: Drauggy <n.fomenko@safe-tech.ru> --------- Co-authored-by: Drauggy <n.fomenko@safe-tech.ru>	2025-06-09 23:25:36 +01:00
Philip Okugbe	50b3f9ddd9	generic iframe embed (#1234 )	2025-06-09 22:32:23 +01:00
Philip Okugbe	0029f84d50	feat: toggle table header row and column (#1203 ) * feat: toggle table header row and column * switch position	2025-06-09 05:39:43 +01:00
Philip Okugbe	6d024fc3de	feat: bulk page imports (#1219 ) * refactor imports - WIP * Add readstream * WIP * fix attachmentId render * fix attachmentId render * turndown video tag * feat: add stream upload support and improve file handling - Add stream upload functionality to storage drivers\n- Improve ZIP file extraction with better encoding handling\n- Fix attachment ID rendering issues\n- Add AWS S3 upload stream support\n- Update dependencies for better compatibility * WIP * notion formatter * move embed parser to editor-ext package * import embeds * utility files * cleanup * Switch from happy-dom to cheerio * Refine code * WIP * bug fixes and UI * sync * WIP * sync * keep import modal mounted * Show modal during upload * WIP * WIP	2025-06-09 04:29:27 +01:00