diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 17970ebe8..8823f3cdd 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,6 +5,7 @@
"vitest.explorer",
"ms-playwright.playwright",
"tobermory.es6-string-html",
- "dbaeumer.vscode-eslint"
+ "dbaeumer.vscode-eslint",
+ "yzhang.markdown-all-in-one"
]
}
diff --git a/config-sample.ini b/config-sample.ini
index 83f10c4f7..f89790163 100644
--- a/config-sample.ini
+++ b/config-sample.ini
@@ -25,6 +25,11 @@ keyPath=
# expressjs shortcuts are supported: loopback(127.0.0.1/8, ::1/128), linklocal(169.254.0.0/16, fe80::/10), uniquelocal(10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
trustedReverseProxy=false
+# setting the CORS headers for cross-origin requests
+# corsAllowOrigin='*'
+# corsAllowMethods='GET,POST,PUT,DELETE,PATCH'
+# corsAllowHeaders='Content-Type,Authorization'
+
[Session]
# Use this setting to set a custom value for the "Max-Age" Attribute of the session cookie.
diff --git a/docs/Release Notes/Release Notes/v0.93.0.md b/docs/Release Notes/Release Notes/v0.93.0.md
index fd13d57b4..dcbbfc016 100644
--- a/docs/Release Notes/Release Notes/v0.93.0.md
+++ b/docs/Release Notes/Release Notes/v0.93.0.md
@@ -1,7 +1,4 @@
# v0.93.0
-## 💡 Key highlights
-
-* …
## 🐞 Bugfixes
@@ -15,6 +12,10 @@
* [config.Session.cookieMaxAge is ignored](https://github.com/TriliumNext/Notes/issues/1709) by @pano9000
* [Return correct HTTP status code on failed login attempts instead of 200](https://github.com/TriliumNext/Notes/issues/1707) by @pano9000
* [Calendar stops displaying notes after adding a Day Note](https://github.com/TriliumNext/Notes/issues/1705)
+* Full anonymization not redacting attachment titles.
+* Unable to trigger "Move to" dialog via keyboard shortcut.
+* [Note ordering doesn't load correctly, only shows up right after moving a note](https://github.com/TriliumNext/Notes/issues/1727)
+* [Note selection dialog shows icon class when selecting result with arrow button (jump to note / create link)](https://github.com/TriliumNext/Notes/issues/1721)
## ✨ Improvements
@@ -23,6 +24,7 @@
* Reduce extra whitespace between list items.
* Preserve include note.
* Handle note titles that contain inline code.
+ * Support to-do lists.
* In-app help:
* Document structure is now precalculated, so start-up time should be slightly better.
* Optimized the content in order to reduce the size on disk.
@@ -35,10 +37,8 @@
* Basic Touch Bar support for macOS.
* [Support Bearer Token](https://github.com/TriliumNext/Notes/issues/1701)
* The tab bar is now scrollable when there are many tabs by @SiriusXT
-
-## 🌍 Internationalization
-
-* …
+* Make each part of the note path clickable by @SiriusXT
+* Allow setting CORS headers by @yiranlus
## 📖 Documentation
@@ -47,6 +47,5 @@
## 🛠️ Technical updates
-* upgrade to express 5.1.0 by @pano9000
* update dependency mind-elixir to v4.5.1
* remove non-working cookiePath option by @pano9000
\ No newline at end of file
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index b6d30ba56..1da61776d 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -9968,6 +9968,26 @@
"format": "markdown",
"dataFileName": "Trilium instance.md",
"attachments": []
+ },
+ {
+ "isClone": false,
+ "noteId": "LWtBjFej3wX3",
+ "notePath": [
+ "pOsGYCXsbNQG",
+ "tC7s2alapj8V",
+ "Gzjqa934BdH4",
+ "LWtBjFej3wX3"
+ ],
+ "title": "Cross-Origin Resource Sharing (CORS)",
+ "notePosition": 20,
+ "prefix": null,
+ "isExpanded": false,
+ "type": "text",
+ "mime": "text/html",
+ "attributes": [],
+ "format": "markdown",
+ "dataFileName": "Cross-Origin Resource Sharing .md",
+ "attachments": []
}
]
},
diff --git a/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Cross-Origin Resource Sharing .md b/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Cross-Origin Resource Sharing .md
new file mode 100644
index 000000000..31feaff99
--- /dev/null
+++ b/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Cross-Origin Resource Sharing .md
@@ -0,0 +1,6 @@
+# Cross-Origin Resource Sharing (CORS)
+By default, Trilium cannot be accessed in web browsers by requests coming from other domains/origins than Trilium itself.
+
+However, it is possible to manually configure [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CORS) since Trilium v0.93.0 using environment variables or `config.ini`, as follows:
+
+CORS Header Corresponding option in config.ini Corresponding option in environment variables in the Network section Access-Control-Allow-OriginTRILIUM_NETWORK_CORS_ALLOW_ORIGINcorsAllowOrigin Access-Control-Allow-MethodsTRILIUM_NETWORK_CORS_ALLOW_METHODScorsAllowMethods Access-Control-Allow-HeadersTRILIUM_NETWORK_CORS_ALLOW_HEADERScorsAllowHeaders
By default, Trilium cannot be accessed in web browsers by requests coming
+ from other domains/origins than Trilium itself.
+However, it is possible to manually configure Cross-Origin Resource Sharing (CORS) since
+ Trilium v0.93.0 using environment variables or config.ini,
+ as follows:
+
+
+
+
+
+
+ CORS Header
+ Corresponding option in config.ini
+
+ Corresponding option in environment variables in the Network section
+
+
+
+
+ Access-Control-Allow-Origin
+ TRILIUM_NETWORK_CORS_ALLOW_ORIGIN
+ corsAllowOrigin
+
+ Access-Control-Allow-Methods
+ TRILIUM_NETWORK_CORS_ALLOW_METHODS
+ corsAllowMethods
+
+ Access-Control-Allow-Headers
+ TRILIUM_NETWORK_CORS_ALLOW_HEADERS
+ corsAllowHeaders
+
+
+
+
\ No newline at end of file
diff --git a/src/public/app/entities/fnote.ts b/src/public/app/entities/fnote.ts
index 23ffdb1b0..e968dcae9 100644
--- a/src/public/app/entities/fnote.ts
+++ b/src/public/app/entities/fnote.ts
@@ -152,7 +152,7 @@ class FNote {
for (const branchId of Object.values(this.childToBranch)) {
const notePosition = this.froca.getBranch(branchId)?.notePosition;
- if (notePosition) {
+ if (notePosition !== undefined) {
branchIdPos[branchId] = notePosition;
}
}
diff --git a/src/public/app/services/link.ts b/src/public/app/services/link.ts
index 138df7221..a0d464741 100644
--- a/src/public/app/services/link.ts
+++ b/src/public/app/services/link.ts
@@ -278,15 +278,20 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
const { notePath, viewScope } = parseNavigationStateFromUrl(hrefLink);
const ctrlKey = utils.isCtrlKey(evt);
+ const shiftKey = evt.shiftKey;
const isLeftClick = "which" in evt && evt.which === 1;
const isMiddleClick = "which" in evt && evt.which === 2;
const targetIsBlank = ($link?.attr("target") === "_blank");
const openInNewTab = (isLeftClick && ctrlKey) || isMiddleClick || targetIsBlank;
+ const activate = (isLeftClick && ctrlKey && shiftKey) || (isMiddleClick && shiftKey);
+ const openInNewWindow = isLeftClick && evt.shiftKey && !ctrlKey;
if (notePath) {
- if (openInNewTab) {
+ if (openInNewWindow) {
+ appContext.triggerCommand("openInWindow", { notePath, viewScope });
+ } else if (openInNewTab) {
appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
- activate: targetIsBlank,
+ activate: activate ? true : targetIsBlank,
viewScope
});
} else if (isLeftClick) {
diff --git a/src/public/app/services/note_autocomplete.ts b/src/public/app/services/note_autocomplete.ts
index a92c241a6..c9e39785e 100644
--- a/src/public/app/services/note_autocomplete.ts
+++ b/src/public/app/services/note_autocomplete.ts
@@ -21,6 +21,7 @@ function getSearchDelay(notesCount: number): number {
}
let searchDelay = getSearchDelay(notesCount);
+// TODO: Deduplicate with server.
export interface Suggestion {
noteTitle?: string;
externalLink?: string;
@@ -29,6 +30,7 @@ export interface Suggestion {
highlightedNotePathTitle?: string;
action?: string | "create-note" | "search-notes" | "external-link";
parentNoteId?: string;
+ icon?: string;
}
interface Options {
@@ -262,7 +264,7 @@ function initNoteAutocomplete($el: JQuery, options?: Options) {
},
displayKey: "notePathTitle",
templates: {
- suggestion: (suggestion) => suggestion.highlightedNotePathTitle
+ suggestion: (suggestion) => `");
+ const pathSegments: string[] = [];
+ const lastIndex = notePath.length - 1;
+
+ for (let i = 0; i < notePath.length; i++) {
+ const noteId = notePath[i];
+ pathSegments.push(noteId);
+ const title = await treeService.getNoteTitle(noteId);
+ const $noteLink = await linkService.createLink(pathSegments.join("/"), { title });
- const $noteLink = await linkService.createLink(notePath, { title });
-
- $noteLink.find("a").addClass("no-tooltip-preview tn-link");
+ $noteLink.find("a").addClass("no-tooltip-preview tn-link");
+ $pathItem.append($noteLink);
+
+ if (i != lastIndex) {
+ $pathItem.append(" / ");
+ }
+ }
const icons = [];
- if (this.notePath === notePath) {
- $noteLink.addClass("path-current");
+ if (this.notePath === notePath.join("/")) {
+ $pathItem.addClass("path-current");
}
if (!notePathRecord || notePathRecord.isInHoistedSubTree) {
- $noteLink.addClass("path-in-hoisted-subtree");
+ $pathItem.addClass("path-in-hoisted-subtree");
} else {
icons.push(` ").append($noteLink);
+ return $pathItem;
}
entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
diff --git a/src/routes/api/autocomplete.ts b/src/routes/api/autocomplete.ts
index bbe990bcd..459555968 100644
--- a/src/routes/api/autocomplete.ts
+++ b/src/routes/api/autocomplete.ts
@@ -75,7 +75,8 @@ function getRecentNotes(activeNoteId: string) {
notePath: rn.notePath,
noteTitle: title,
notePathTitle,
- highlightedNotePathTitle: `Hello {
+ const input = trimIndentation`\
+ - [x] Hello
+ - [ ] World`;
+ const expected = ``;
+ expect(markdownService.renderToHtml(input, "Title")).toStrictEqual(expected);
+ });
+
});
diff --git a/src/services/import/markdown.ts b/src/services/import/markdown.ts
index d84deb043..8b7f8913d 100644
--- a/src/services/import/markdown.ts
+++ b/src/services/import/markdown.ts
@@ -48,12 +48,52 @@ class CustomMarkdownRenderer extends Renderer {
}
list(token: Tokens.List): string {
- return super.list(token)
+ let result = super.list(token)
.replace("\n", "") // we replace the first one only.
.trimEnd();
+
+ // Handle todo-list in the CKEditor format.
+ if (token.items.some(item => item.task)) {
+ result = result.replace(/^/, "");
+ }
+
+ return result;
+ }
+
+ checkbox({ checked }: Tokens.Checkbox): string {
+ return '${this.parser.parse(item.tokens, !!item.loose)} `;
+ return `${itemBody}