containing the checkbox for a promoted boolean attribute */
+div.promoted-attribute-cell div:has(input[type="checkbox"]) {
+ order: -1; /* Relocate the checkbox before the label */
+ margin-right: 1.5em;
+}
+
+/* The element containing the "new attribute" and "remove this attribute button" */
+div.promoted-attribute-cell .multiplicity:has(span) {
+ --icon-button-size: 24px;
+
+ margin-left: 8px;
+ margin-right: calc(var(--pa-card-padding-left) - var(--pa-card-padding-right));
+ font-size: 0; /* Prevent whitespaces creating a gap between buttons */
+}
\ No newline at end of file
diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 296a46136..61bccbe77 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1120,7 +1120,7 @@
"attachment_erasure_timeout": {
"attachment_erasure_timeout": "附件清理超时",
"attachment_auto_deletion_description": "如果附件在一段时间后不再被笔记引用，它们将自动被删除（并被清理）。",
- "erase_attachments_after": "Erase unused attachments after:",
+ "erase_attachments_after": "",
"manual_erasing_description": "您还可以手动触发清理（而不考虑上述定义的超时时间）：",
"erase_unused_attachments_now": "立即清理未使用的附件笔记",
"unused_attachments_erased": "未使用的附件已被删除。"
@@ -1132,15 +1132,15 @@
"note_erasure_timeout": {
"note_erasure_timeout_title": "笔记清理超时",
"note_erasure_description": "被删除的笔记（以及属性、历史版本等）最初仅被标记为“删除”，可以从“最近修改”对话框中恢复它们。经过一段时间后，已删除的笔记会被“清理”，这意味着它们的内容将无法恢复。此设置允许您配置从删除到清除笔记之间的时间长度。",
- "erase_notes_after": "Erase notes after:",
+ "erase_notes_after": "",
"manual_erasing_description": "您还可以手动触发清理（不考虑上述定义的超时）：",
"erase_deleted_notes_now": "立即清理已删除的笔记",
"deleted_notes_erased": "已删除的笔记已被清理。"
},
"revisions_snapshot_interval": {
- "note_revisions_snapshot_interval_title": "笔记修改快照间隔",
- "note_revisions_snapshot_description": "笔记修改快照时间间隔是指经过多少秒后会为笔记创建新的修改历史。更多信息请参见wiki。",
- "snapshot_time_interval_label": "笔记修改快照时间间隔（单位:秒）"
+ "note_revisions_snapshot_interval_title": "",
+ "note_revisions_snapshot_description": "",
+ "snapshot_time_interval_label": ""
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "笔记历史快照限制",
@@ -1259,7 +1259,7 @@
"protected_session_timeout_description": "保护会话超时是一个时间段，超时后保护会话会从浏览器内存中清除。这是从最后一次与保护笔记的交互开始计时的。更多信息请见",
"wiki": "维基",
"for_more_info": "更多信息。",
- "protected_session_timeout_label": "保护会话超时（秒）",
+ "protected_session_timeout_label": "",
"reset_confirmation": "重置密码将永久丧失对所有现受保护笔记的访问。您真的要重置密码吗？",
"reset_success_message": "密码已重置。请设置新密码",
"change_password_heading": "更改密码",
diff --git a/src/public/translations/de/translation.json b/src/public/translations/de/translation.json
index 718285843..daf823696 100644
--- a/src/public/translations/de/translation.json
+++ b/src/public/translations/de/translation.json
@@ -1166,8 +1166,8 @@
},
"revisions_snapshot_interval": {
"note_revisions_snapshot_interval_title": "Snapshot-Intervall für Notizrevisionen",
- "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit in Sekunden, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im Wiki.",
- "snapshot_time_interval_label": "Zeitintervall für Notiz-Revisions-Snapshot (in Sekunden)"
+ "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im Wiki.",
+ "snapshot_time_interval_label": "Zeitintervall für Notiz-Revisions-Snapshot:"
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "Limit für Notizrevision-Snapshots",
@@ -1286,7 +1286,7 @@
"protected_session_timeout_description": "Das Zeitlimit für geschützte Sitzungen ist ein Zeitraum, nach dem die geschützte Sitzung aus dem Speicher des Browsers gelöscht wird. Dies wird ab der letzten Interaktion mit geschützten Notizen gemessen. Sehen",
"wiki": "Wiki",
"for_more_info": "für weitere Informationen.",
- "protected_session_timeout_label": "Zeitüberschreitung der geschützten Sitzung (in Sekunden)",
+ "protected_session_timeout_label": "Zeitüberschreitung der geschützten Sitzung:",
"reset_confirmation": "Durch das Zurücksetzen des Passworts verlierst du für immer den Zugriff auf alle Ihre bestehenden geschützten Notizen. Möchtest du das Passwort wirklich zurücksetzen?",
"reset_success_message": "Das Passwort wurde zurückgesetzt. Bitte lege ein neues Passwort fest",
"change_password_heading": "Kennwort ändern",
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index bfd0f4b23..9e7cd6454 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -824,6 +824,7 @@
},
"promoted_attributes": {
"promoted_attributes": "Promoted Attributes",
+ "unset-field-placeholder": "not set",
"url_placeholder": "http://website...",
"open_external_link": "Open external link",
"unknown_label_type": "Unknown label type '{{type}}'",
@@ -1166,8 +1167,8 @@
},
"revisions_snapshot_interval": {
"note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
- "note_revisions_snapshot_description": "The Note revision snapshot interval is the time in seconds after which a new note revision will be created for the note. See wiki for more info.",
- "snapshot_time_interval_label": "Note revision snapshot time interval (in seconds):"
+ "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See wiki for more info.",
+ "snapshot_time_interval_label": "Note revision snapshot time interval:"
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "Note Revision Snapshot Limit",
@@ -1286,7 +1287,7 @@
"protected_session_timeout_description": "Protected session timeout is a time period after which the protected session is wiped from the browser's memory. This is measured from the last interaction with protected notes. See",
"wiki": "wiki",
"for_more_info": "for more info.",
- "protected_session_timeout_label": "Protected session timeout (in seconds)",
+ "protected_session_timeout_label": "Protected session timeout:",
"reset_confirmation": "By resetting the password you will forever lose access to all your existing protected notes. Do you really want to reset the password?",
"reset_success_message": "Password has been reset. Please set new password",
"change_password_heading": "Change Password",
@@ -1657,6 +1658,17 @@
"hours": "Hours",
"days": "Days"
},
+ "share": {
+ "title": "Share Settings",
+ "redirect_bare_domain": "Redirect bare domain to Share page",
+ "redirect_bare_domain_description": "Redirect anonymous users to the Share page instead of showing Login",
+ "show_login_link": "Show Login link in Share theme",
+ "show_login_link_description": "Add a login link to the Share page footer",
+ "check_share_root": "Check Share Root Status",
+ "share_root_found": "Share root note '{{noteTitle}}' is ready",
+ "share_root_not_found": "No note with #shareRoot label found",
+ "share_root_not_shared": "Note '{{noteTitle}}' has #shareRoot label but is not Shared"
+ },
"time_selector": {
"invalid_input": "The entered time value is not a valid number.",
"minimum_input": "The entered time value needs to be at least {{minimumSeconds}} seconds."
diff --git a/src/public/translations/es/translation.json b/src/public/translations/es/translation.json
index 3810997c3..f8327f774 100644
--- a/src/public/translations/es/translation.json
+++ b/src/public/translations/es/translation.json
@@ -1163,8 +1163,8 @@
},
"revisions_snapshot_interval": {
"note_revisions_snapshot_interval_title": "Intervalo de instantáneas de revisiones de notas",
- "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo en segundos después de lo cual se creará una nueva revisión para la nota. Ver wiki para obtener más información.",
- "snapshot_time_interval_label": "Intervalo de tiempo de la instantánea de revisión de notas (en segundos)"
+ "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo después de lo cual se creará una nueva revisión para la nota. Ver wiki para obtener más información.",
+ "snapshot_time_interval_label": "Intervalo de tiempo de la instantánea de revisión de notas:"
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "Límite de respaldos de revisiones de nota",
@@ -1283,7 +1283,7 @@
"protected_session_timeout_description": "El tiempo de espera de la sesión protegida es el período de tiempo después del cual la sesión protegida se borra de la memoria del navegador. Esto se mide desde la última interacción con notas protegidas. Ver",
"wiki": "wiki",
"for_more_info": "para más información.",
- "protected_session_timeout_label": "Tiempo de espera de sesión protegida (en segundos)",
+ "protected_session_timeout_label": "Tiempo de espera de sesión protegida:",
"reset_confirmation": "Al restablecer la contraseña, perderá para siempre el acceso a todas sus notas protegidas existentes. ¿Realmente quieres restablecer la contraseña?",
"reset_success_message": "La contraseña ha sido restablecida. Por favor establezca una nueva contraseña",
"change_password_heading": "Cambiar contraseña",
diff --git a/src/public/translations/fr/translation.json b/src/public/translations/fr/translation.json
index 891760da8..0811c336b 100644
--- a/src/public/translations/fr/translation.json
+++ b/src/public/translations/fr/translation.json
@@ -1108,8 +1108,8 @@
},
"revisions_snapshot_interval": {
"note_revisions_snapshot_interval_title": "Intervalle d'enregistrement automatique des versions des notes",
- "note_revisions_snapshot_description": "L'intervalle d'enregistrement automatique des versions de note est le temps en secondes après lequel une nouvelle version de note est créée pour une note. Consultez le wiki pour plus d'informations.",
- "snapshot_time_interval_label": "Intervalle de temps entre deux enregistrements de version de note (en secondes) :"
+ "note_revisions_snapshot_description": "L'intervalle d'enregistrement automatique des versions de note est le temps après lequel une nouvelle version de note est créée pour une note. Consultez le wiki pour plus d'informations.",
+ "snapshot_time_interval_label": "Intervalle de temps entre deux enregistrements de version de note :"
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "Limite des enregistrements de version de note",
@@ -1226,7 +1226,7 @@
"protected_session_timeout_description": "Le délai d'expiration de la session protégée est une période de temps après laquelle la session protégée est effacée de la mémoire du navigateur. Il est mesuré à partir de la dernière interaction avec des notes protégées. Voir",
"wiki": "wiki",
"for_more_info": "pour plus d'informations.",
- "protected_session_timeout_label": "Délai d'expiration de la session protégée (en secondes)",
+ "protected_session_timeout_label": "Délai d'expiration de la session protégée :",
"reset_confirmation": "En réinitialisant le mot de passe, vous perdrez à jamais l'accès à toutes vos notes protégées existantes. Voulez-vous vraiment réinitialiser le mot de passe ?",
"reset_success_message": "Le mot de passe a été réinitialisé. Veuillez définir un nouveau mot de passe",
"change_password_heading": "Changer le mot de passe",
diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json
index 2d22c2c3c..5ed59339e 100644
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@@ -923,7 +923,7 @@
"password_mismatch": "Noile parole nu coincid.",
"protected_session_timeout": "Timpul de expirare a sesiunii protejate",
"protected_session_timeout_description": "Timpul de expirare a sesiunii protejate este o perioadă de timp după care sesiunea protejată este ștearsă din memoria navigatorului. Aceasta este măsurată de la timpul ultimei interacțiuni cu notițele protejate. Vezi",
- "protected_session_timeout_label": "Timpul de expirare a sesiunii protejate (în secunde)",
+ "protected_session_timeout_label": "Timpul de expirare a sesiunii protejate:",
"reset_confirmation": "Prin resetarea parolei se va pierde pentru totdeauna accesul la notițele protejate existente. Sigur doriți resetarea parolei?",
"reset_link": "click aici pentru a o reseta.",
"reset_success_message": "Parola a fost resetată. Setați o nouă parolă",
@@ -944,7 +944,8 @@
"remove_this_attribute": "Elimină acest atribut",
"unknown_attribute_type": "Tip de atribut necunoscut „{{type}}”",
"unknown_label_type": "Tip de etichetă necunoscut „{{type}}”",
- "url_placeholder": "http://siteweb..."
+ "url_placeholder": "http://siteweb...",
+ "unset-field-placeholder": "nesetat"
},
"prompt": {
"defaultTitle": "Aviz",
@@ -1068,9 +1069,9 @@
"note_revisions": "Revizii ale notiței"
},
"revisions_snapshot_interval": {
- "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul în secunde după care se crează o nouă revizie a unei notițe. Vedeți wiki-ul pentru mai multe informații.",
+ "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul după care se crează o nouă revizie a unei notițe. Vedeți wiki-ul pentru mai multe informații.",
"note_revisions_snapshot_interval_title": "Intervalul de salvare a reviziilor",
- "snapshot_time_interval_label": "Intervalul de salvare a reviziilor (în secunde)"
+ "snapshot_time_interval_label": "Intervalul de salvare a reviziilor:"
},
"ribbon": {
"edited_notes_message": "Tab-ul panglicii „Notițe editate” se va deschide automat pentru notițele zilnice",
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index 654033580..ae8381b5b 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1098,7 +1098,7 @@
"attachment_erasure_timeout": {
"attachment_erasure_timeout": "附件清理超時",
"attachment_auto_deletion_description": "如果附件在一段時間後不再被筆記引用，它們將自動被刪除（並被清理）。",
- "erase_attachments_after": "Erase unused attachments after:",
+ "erase_attachments_after": "",
"manual_erasing_description": "您還可以手動觸發清理（而不考慮上述定義的超時時間）：",
"erase_unused_attachments_now": "立即清理未使用的附件筆記",
"unused_attachments_erased": "未使用的附件已被刪除。"
@@ -1110,15 +1110,15 @@
"note_erasure_timeout": {
"note_erasure_timeout_title": "筆記清理超時",
"note_erasure_description": "被刪除的筆記（以及屬性、歷史版本等）最初僅被標記為「刪除」，可以從「最近修改」對話框中恢復它們。經過一段時間後，已刪除的筆記會被「清理」，這意味著它們的內容將無法恢復。此設定允許您設定從刪除到清除筆記之間的時間長度。",
- "erase_notes_after": "Erase notes after:",
+ "erase_notes_after": "",
"manual_erasing_description": "您還可以手動觸發清理（不考慮上述定義的超時）：",
"erase_deleted_notes_now": "立即清理已刪除的筆記",
"deleted_notes_erased": "已刪除的筆記已被清理。"
},
"revisions_snapshot_interval": {
- "note_revisions_snapshot_interval_title": "筆記修改快照間隔",
- "note_revisions_snapshot_description": "筆記修改快照時間間隔是指經過多少秒後會為筆記新增新的修改歷史。更多資訊請參見wiki。",
- "snapshot_time_interval_label": "筆記修改快照時間間隔（單位:秒）"
+ "note_revisions_snapshot_interval_title": "",
+ "note_revisions_snapshot_description": "",
+ "snapshot_time_interval_label": ""
},
"revisions_snapshot_limit": {
"note_revisions_snapshot_limit_title": "筆記歷史快照限制",
@@ -1237,7 +1237,7 @@
"protected_session_timeout_description": "保護會話超時是一個時間段，超時後保護會話會從瀏覽器內存中清除。這是從最後一次與保護筆記的交互開始計時的。更多資訊請見",
"wiki": "維基",
"for_more_info": "更多資訊。",
- "protected_session_timeout_label": "保護會話超時（秒）",
+ "protected_session_timeout_label": "",
"reset_confirmation": "重置密碼將永久喪失對所有現受保護筆記的訪問。您真的要重置密碼嗎？",
"reset_success_message": "密碼已重置。請設定新密碼",
"change_password_heading": "更改密碼",
diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts
index 8be441b61..50ff6b6b6 100644
--- a/src/routes/api/options.ts
+++ b/src/routes/api/options.ts
@@ -14,7 +14,9 @@ const ALLOWED_OPTIONS = new Set([
"eraseEntitiesAfterTimeInSeconds",
"eraseEntitiesAfterTimeScale",
"protectedSessionTimeout",
+ "protectedSessionTimeoutTimeScale",
"revisionSnapshotTimeInterval",
+ "revisionSnapshotTimeIntervalTimeScale",
"revisionSnapshotNumberLimit",
"zoomFactor",
"theme",
@@ -73,7 +75,9 @@ const ALLOWED_OPTIONS = new Set([
"textNoteEditorMultilineToolbar",
"layoutOrientation",
"backgroundEffects",
- "allowedHtmlTags" // Allow configuring HTML import tags
+ "allowedHtmlTags",
+ "redirectBareDomain",
+ "showLoginInShareTheme"
]);
function getOptions() {
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 3e8957100..03f40e6e7 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -7,6 +7,8 @@ import { isElectron } from "./utils.js";
import passwordEncryptionService from "./encryption/password_encryption.js";
import config from "./config.js";
import passwordService from "./encryption/password.js";
+import options from "./options.js";
+import attributes from "./attributes.js";
import type { NextFunction, Request, Response } from "express";
const noAuthentication = config.General && config.General.noAuthentication === true;
@@ -15,7 +17,16 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
if (!sqlInit.isDbInitialized()) {
res.redirect("setup");
} else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
- res.redirect("login");
+ const redirectToShare = options.getOptionBool("redirectBareDomain");
+ if (redirectToShare) {
+ // Check if any note has the #shareRoot label
+ const shareRootNotes = attributes.getNotesWithLabel("shareRoot");
+ if (shareRootNotes.length === 0) {
+ res.status(404).json({ message: "Share root not found. Please set up a note with #shareRoot label first." });
+ return;
+ }
+ }
+ res.redirect(redirectToShare ? "share" : "login");
} else {
next();
}
diff --git a/src/services/html_sanitizer.spec.ts b/src/services/html_sanitizer.spec.ts
new file mode 100644
index 000000000..7f5888380
--- /dev/null
+++ b/src/services/html_sanitizer.spec.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import html_sanitizer from "./html_sanitizer.js";
+import { trimIndentation } from "../../spec/support/utils.js";
+
+describe("sanitize", () => {
+ it("filters out position inline CSS", () => {
+ const dirty = ``;
+ const clean = ``;
+ expect(html_sanitizer.sanitize(dirty)).toBe(clean);
+ });
+
+ it("keeps inline styles defined in CKEDitor", () => {
+ const dirty = trimIndentation`\
+