diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1d8dcd453..b05cb4939 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -120,7 +120,7 @@ jobs:
body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md
fail_on_unmatched_files: true
files: upload/*.*
- discussion_category_name: Announcements
+ discussion_category_name: Releases
make_latest: ${{ !contains(github.ref, 'rc') }}
prerelease: ${{ contains(github.ref, 'rc') }}
token: ${{ secrets.RELEASE_PAT }}
diff --git a/_regroup/bin/generate_document.ts b/_regroup/bin/generate_document.ts
index f9d327116..793efc105 100644
--- a/_regroup/bin/generate_document.ts
+++ b/_regroup/bin/generate_document.ts
@@ -91,5 +91,5 @@ async function start() {
}
// @TriliumNextTODO sqlInit.dbReady never seems to resolve so program hangs
-// see https://github.com/TriliumNext/Notes/issues/1020
+// see https://github.com/TriliumNext/Trilium/issues/1020
sqlInit.dbReady.then(cls.wrap(start)).catch((err) => console.error(err));
diff --git a/_regroup/integration-tests/update_check.spec.ts b/_regroup/integration-tests/update_check.spec.ts
index 8cb7f4bf2..38e28bf22 100644
--- a/_regroup/integration-tests/update_check.spec.ts
+++ b/_regroup/integration-tests/update_check.spec.ts
@@ -8,5 +8,5 @@ test("Displays update badge when there is a version available", async ({ page })
await page.getByText(`Version ${expectedVersion} is available,`).click();
const page1 = await page.waitForEvent("popup");
- expect(page1.url()).toBe(`https://github.com/TriliumNext/Notes/releases/tag/v${expectedVersion}`);
+ expect(page1.url()).toBe(`https://github.com/TriliumNext/Trilium/releases/tag/v${expectedVersion}`);
});
diff --git a/apps/client/package.json b/apps/client/package.json
index ae49e4a03..5c198067e 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@triliumnext/client",
- "version": "0.95.0",
+ "version": "0.96.0",
"description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
"private": true,
"license": "AGPL-3.0-only",
diff --git a/apps/client/src/widgets/buttons/global_menu.ts b/apps/client/src/widgets/buttons/global_menu.ts
index 47323e271..65e7d2ed1 100644
--- a/apps/client/src/widgets/buttons/global_menu.ts
+++ b/apps/client/src/widgets/buttons/global_menu.ts
@@ -424,7 +424,7 @@ export default class GlobalMenuWidget extends BasicWidget {
}
downloadLatestVersionCommand() {
- window.open("https://github.com/TriliumNext/Notes/releases/latest");
+ window.open("https://github.com/TriliumNext/Trilium/releases/latest");
}
activeContextChangedEvent() {
diff --git a/apps/client/src/widgets/dialogs/about.ts b/apps/client/src/widgets/dialogs/about.ts
index 06cf118ec..2276a5214 100644
--- a/apps/client/src/widgets/dialogs/about.ts
+++ b/apps/client/src/widgets/dialogs/about.ts
@@ -27,7 +27,7 @@ const TPL = /*html*/`
${t("about.homepage")}
- https://github.com/TriliumNext/Notes
+ https://github.com/TriliumNext/Trilium
${t("about.app_version")}
@@ -92,7 +92,7 @@ export default class AboutDialog extends BasicWidget {
this.$syncVersion.text(appInfo.syncVersion.toString());
this.$buildDate.text(formatDateTime(appInfo.buildDate));
this.$buildRevision.text(appInfo.buildRevision);
- this.$buildRevision.attr("href", `https://github.com/TriliumNext/Notes/commit/${appInfo.buildRevision}`);
+ this.$buildRevision.attr("href", `https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`);
if (utils.isElectron()) {
this.$dataDirectory.html(
$(" ", {
diff --git a/apps/client/src/widgets/dialogs/incorrect_cpu_arch.ts b/apps/client/src/widgets/dialogs/incorrect_cpu_arch.ts
index 8e30060fe..e28e6699a 100644
--- a/apps/client/src/widgets/dialogs/incorrect_cpu_arch.ts
+++ b/apps/client/src/widgets/dialogs/incorrect_cpu_arch.ts
@@ -41,9 +41,9 @@ export default class IncorrectCpuArchDialog extends BasicWidget {
// Open the releases page where users can download the correct version
if (utils.isElectron()) {
const { shell } = utils.dynamicRequire("electron");
- shell.openExternal("https://github.com/TriliumNext/Notes/releases/latest");
+ shell.openExternal("https://github.com/TriliumNext/Trilium/releases/latest");
} else {
- window.open("https://github.com/TriliumNext/Notes/releases/latest", "_blank");
+ window.open("https://github.com/TriliumNext/Trilium/releases/latest", "_blank");
}
});
diff --git a/apps/client/src/widgets/type_widgets/options/other/html_import_tags.ts b/apps/client/src/widgets/type_widgets/options/other/html_import_tags.ts
index 5bb626965..0dd140732 100644
--- a/apps/client/src/widgets/type_widgets/options/other/html_import_tags.ts
+++ b/apps/client/src/widgets/type_widgets/options/other/html_import_tags.ts
@@ -74,7 +74,7 @@ export const DEFAULT_ALLOWED_TAGS = [
"del",
"ins",
"en-media", // for ENEX import
- // Additional tags (https://github.com/TriliumNext/Notes/issues/567)
+ // Additional tags (https://github.com/TriliumNext/Trilium/issues/567)
"acronym",
"article",
"big",
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 31d675138..81a420387 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
{
"name": "@triliumnext/desktop",
- "version": "0.95.0",
+ "version": "0.96.0",
"description": "Build your personal knowledge base with Trilium Notes",
"private": true,
"main": "main.cjs",
diff --git a/apps/server/package.json b/apps/server/package.json
index fd5ec6057..3b92be1a5 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
{
"name": "@triliumnext/server",
- "version": "0.95.0",
+ "version": "0.96.0",
"description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.",
"private": true,
"dependencies": {
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown.html
index 7f46f8adf..d71887009 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown.html
@@ -42,5 +42,5 @@
This will export the notes in an unencrypted form, so if you reimport into
Trilium, make sure to re-protect these notes.
Supported syntax
-See the dedicated page: Supported syntax
+
See the dedicated page: Supported syntax
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown/Supported syntax.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown/Supported syntax.html
index d07d44264..23cce355a 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown/Supported syntax.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown/Supported syntax.html
@@ -41,7 +41,7 @@
Trilium-compatible syntax, but it will not export Trilium Notes into Markdown
files with this syntax.
- The path to pages in wikilinks is resolved relatively to the import root and
+
The path to pages in wikilinks is resolved relatively to the import root and
not the current directory of the note. This is to be inline with other
platforms that use wikilinks such as SilverBullet.
The root path of the import is determined as follows:
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Block quotes & admonitions.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Block quotes & admonitions.html
index 944bb7b40..6f16fc214 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Block quotes & admonitions.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Block quotes & admonitions.html
@@ -62,4 +62,4 @@ class="image image-style-align-center">
are currently no plans for adjusting it or allowing the user to customize
them.
Markdown support
- See Supported syntax .
\ No newline at end of file
+ See Supported syntax .
\ No newline at end of file
diff --git a/apps/server/src/routes/api/app_info.ts b/apps/server/src/routes/api/app_info.ts
index ece825a30..e3d5bd86d 100644
--- a/apps/server/src/routes/api/app_info.ts
+++ b/apps/server/src/routes/api/app_info.ts
@@ -8,7 +8,7 @@ import appInfo from "../../services/app_info.js";
* operationId: app-info
* externalDocs:
* description: Server implementation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/services/app_info.ts
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/services/app_info.ts
* responses:
* '200':
* description: Installation info
diff --git a/apps/server/src/routes/api/login.ts b/apps/server/src/routes/api/login.ts
index 1f190aec2..e235e649b 100644
--- a/apps/server/src/routes/api/login.ts
+++ b/apps/server/src/routes/api/login.ts
@@ -25,7 +25,7 @@ import type { Request } from "express";
* operationId: login-sync
* externalDocs:
* description: HMAC calculation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/services/utils.ts#L62-L66
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/services/utils.ts#L62-L66
* requestBody:
* content:
* application/json:
diff --git a/apps/server/src/routes/api/sync.ts b/apps/server/src/routes/api/sync.ts
index 1454e4a48..22c4fa4f0 100644
--- a/apps/server/src/routes/api/sync.ts
+++ b/apps/server/src/routes/api/sync.ts
@@ -95,7 +95,7 @@ function forceFullSync() {
* operationId: sync-changed
* externalDocs:
* description: Server implementation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/api/sync.ts
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/routes/api/sync.ts
* parameters:
* - in: query
* name: instanceId
@@ -214,7 +214,7 @@ const partialRequests: Record<
* operationId: sync-update
* externalDocs:
* description: Server implementation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/api/sync.ts
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/routes/api/sync.ts
* parameters:
* - in: header
* name: pageCount
diff --git a/apps/server/src/routes/api/tree.ts b/apps/server/src/routes/api/tree.ts
index bd6c9bb61..b9621d5d0 100644
--- a/apps/server/src/routes/api/tree.ts
+++ b/apps/server/src/routes/api/tree.ts
@@ -136,7 +136,7 @@ function getNotesAndBranchesAndAttributes(_noteIds: string[] | Set) {
* operationId: tree
* externalDocs:
* description: Server implementation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/api/tree.ts
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/routes/api/tree.ts
* parameters:
* - in: query
* name: subTreeNoteId
diff --git a/apps/server/src/routes/csrf_protection.ts b/apps/server/src/routes/csrf_protection.ts
index 391be0aaa..0b0ba1aac 100644
--- a/apps/server/src/routes/csrf_protection.ts
+++ b/apps/server/src/routes/csrf_protection.ts
@@ -8,7 +8,7 @@ const doubleCsrfUtilities = doubleCsrf({
path: "/",
secure: false,
sameSite: "strict",
- httpOnly: !isElectron // set to false for Electron, see https://github.com/TriliumNext/Notes/pull/966
+ httpOnly: !isElectron // set to false for Electron, see https://github.com/TriliumNext/Trilium/pull/966
},
cookieName: "_csrf"
});
diff --git a/apps/server/src/routes/login.ts b/apps/server/src/routes/login.ts
index 10bfa5b94..2acb3a4d5 100644
--- a/apps/server/src/routes/login.ts
+++ b/apps/server/src/routes/login.ts
@@ -77,7 +77,7 @@ function setPassword(req: Request, res: Response) {
* operationId: login-normal
* externalDocs:
* description: HMAC calculation
- * url: https://github.com/TriliumNext/Notes/blob/v0.91.6/src/services/utils.ts#L62-L66
+ * url: https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/services/utils.ts#L62-L66
* requestBody:
* content:
* application/x-www-form-urlencoded:
diff --git a/apps/server/src/services/export/markdown.spec.ts b/apps/server/src/services/export/markdown.spec.ts
index 026271751..6e5eb2735 100644
--- a/apps/server/src/services/export/markdown.spec.ts
+++ b/apps/server/src/services/export/markdown.spec.ts
@@ -293,25 +293,25 @@ describe("Markdown export", () => {
const html = trimIndentation`\
`;
const expected = trimIndentation`\
- * [@JYC333](https://github.com/JYC333) made their first contribution in [#294](https://github.com/TriliumNext/Notes/pull/294)
- * [Note Tooltip isn't removed when clicking on internal trilium link in read-only mode](https://github.com/TriliumNext/Notes/issues/375)
- * [Calendar dropdown won't close if click/right-click other button that open notes from launcher bar](https://github.com/TriliumNext/Notes/issues/384)`;
+ * [@JYC333](https://github.com/JYC333) made their first contribution in [#294](https://github.com/TriliumNext/Trilium/pull/294)
+ * [Note Tooltip isn't removed when clicking on internal trilium link in read-only mode](https://github.com/TriliumNext/Trilium/issues/375)
+ * [Calendar dropdown won't close if click/right-click other button that open notes from launcher bar](https://github.com/TriliumNext/Trilium/issues/384)`;
expect(markdownExportService.toMarkdown(html)).toBe(expected);
});
diff --git a/apps/server/src/services/html_sanitizer.ts b/apps/server/src/services/html_sanitizer.ts
index 4f2bc5fc0..da707b7c3 100644
--- a/apps/server/src/services/html_sanitizer.ts
+++ b/apps/server/src/services/html_sanitizer.ts
@@ -84,7 +84,7 @@ export const DEFAULT_ALLOWED_TAGS = [
"del",
"ins",
"en-media", // for ENEX import
- // Additional tags (https://github.com/TriliumNext/Notes/issues/567)
+ // Additional tags (https://github.com/TriliumNext/Trilium/issues/567)
"acronym",
"article",
"big",
diff --git a/apps/server/src/services/import/markdown.spec.ts b/apps/server/src/services/import/markdown.spec.ts
index 1dcf488b1..c8d06e28e 100644
--- a/apps/server/src/services/import/markdown.spec.ts
+++ b/apps/server/src/services/import/markdown.spec.ts
@@ -259,15 +259,15 @@ $$`;
const input = trimIndentation`\
### π Bugfixes
- * [v0.90.4 docker does not read USER\_UID and USER\_GID from environment](https://github.com/TriliumNext/Notes/issues/331)
- * [Invalid CSRF token on Android phone](https://github.com/TriliumNext/Notes/issues/318)
- * [Excess spacing in lists](https://github.com/TriliumNext/Notes/issues/341)`;
+ * [v0.90.4 docker does not read USER\_UID and USER\_GID from environment](https://github.com/TriliumNext/Trilium/issues/331)
+ * [Invalid CSRF token on Android phone](https://github.com/TriliumNext/Trilium/issues/318)
+ * [Excess spacing in lists](https://github.com/TriliumNext/Trilium/issues/341)`;
const expected = [
/*html*/`π Bugfixes `,
/*html*/``
].join("");
expect(markdownService.renderToHtml(input, "Title")).toStrictEqual(expected);
diff --git a/apps/website/src/lib/download-helper.ts b/apps/website/src/lib/download-helper.ts
index 4e2b5597c..47c071403 100644
--- a/apps/website/src/lib/download-helper.ts
+++ b/apps/website/src/lib/download-helper.ts
@@ -117,11 +117,11 @@ export const downloadMatrix: DownloadMatrix = {
},
tarX64: {
name: "x86 (.tar.xz)",
- url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz`
+ url: `https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz`
},
tarArm64: {
name: "ARM (.tar.xz)",
- url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz`
+ url: `https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz`
},
nixos: {
name: "NixOS module",
@@ -150,7 +150,7 @@ export const downloadMatrix: DownloadMatrix = {
export function buildDownloadUrl(app: App, platform: Platform, format: string, architecture: Architecture): string {
if (app === "desktop") {
return downloadMatrix.desktop[platform]?.downloads[format].url ??
- `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-v${version}-${platform}-${architecture}.${format}`;
+ `https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${platform}-${architecture}.${format}`;
} else if (app === "server") {
return downloadMatrix.server[platform]?.downloads[format].url ?? "#";
} else {
diff --git a/docs/Release Notes/!!!meta.json b/docs/Release Notes/!!!meta.json
index 9d8183825..137a2820d 100644
--- a/docs/Release Notes/!!!meta.json
+++ b/docs/Release Notes/!!!meta.json
@@ -61,6 +61,32 @@
"attachments": [],
"dirFileName": "Release Notes",
"children": [
+ {
+ "isClone": false,
+ "noteId": "mYXFde3LuNR7",
+ "notePath": [
+ "hD3V4hiu2VW4",
+ "mYXFde3LuNR7"
+ ],
+ "title": "v0.96.0",
+ "notePosition": 10,
+ "prefix": null,
+ "isExpanded": false,
+ "type": "text",
+ "mime": "text/html",
+ "attributes": [
+ {
+ "type": "relation",
+ "name": "template",
+ "value": "wyurrlcDl416",
+ "isInheritable": false,
+ "position": 60
+ }
+ ],
+ "format": "markdown",
+ "dataFileName": "v0.96.0.md",
+ "attachments": []
+ },
{
"isClone": false,
"noteId": "jthwbL0FdaeU",
@@ -69,7 +95,7 @@
"jthwbL0FdaeU"
],
"title": "v0.95.0",
- "notePosition": 10,
+ "notePosition": 20,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -95,7 +121,7 @@
"7HGYsJbLuhnv"
],
"title": "v0.94.1",
- "notePosition": 20,
+ "notePosition": 30,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -121,7 +147,7 @@
"Neq53ujRGBqv"
],
"title": "v0.94.0",
- "notePosition": 30,
+ "notePosition": 40,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -147,7 +173,7 @@
"VN3xnce1vLkX"
],
"title": "v0.93.0",
- "notePosition": 40,
+ "notePosition": 50,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -165,7 +191,7 @@
"WRaBfQqPr6qo"
],
"title": "v0.92.7",
- "notePosition": 50,
+ "notePosition": 60,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -191,7 +217,7 @@
"a2rwfKNmUFU1"
],
"title": "v0.92.6",
- "notePosition": 60,
+ "notePosition": 70,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -209,7 +235,7 @@
"fEJ8qErr0BKL"
],
"title": "v0.92.5-beta",
- "notePosition": 70,
+ "notePosition": 80,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -227,7 +253,7 @@
"kkkZQQGSXjwy"
],
"title": "v0.92.4",
- "notePosition": 80,
+ "notePosition": 90,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -245,7 +271,7 @@
"vAroNixiezaH"
],
"title": "v0.92.3-beta",
- "notePosition": 90,
+ "notePosition": 100,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -263,7 +289,7 @@
"mHEq1wxAKNZd"
],
"title": "v0.92.2-beta",
- "notePosition": 100,
+ "notePosition": 110,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -281,7 +307,7 @@
"IykjoAmBpc61"
],
"title": "v0.92.1-beta",
- "notePosition": 110,
+ "notePosition": 120,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -299,7 +325,7 @@
"dq2AJ9vSBX4Y"
],
"title": "v0.92.0-beta",
- "notePosition": 120,
+ "notePosition": 130,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -317,7 +343,7 @@
"3a8aMe4jz4yM"
],
"title": "v0.91.6",
- "notePosition": 130,
+ "notePosition": 140,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -335,7 +361,7 @@
"8djQjkiDGESe"
],
"title": "v0.91.5",
- "notePosition": 140,
+ "notePosition": 150,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -353,7 +379,7 @@
"OylxVoVJqNmr"
],
"title": "v0.91.4-beta",
- "notePosition": 150,
+ "notePosition": 160,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -371,7 +397,7 @@
"tANGQDvnyhrj"
],
"title": "v0.91.3-beta",
- "notePosition": 160,
+ "notePosition": 170,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -389,7 +415,7 @@
"hMoBfwSoj1SC"
],
"title": "v0.91.2-beta",
- "notePosition": 170,
+ "notePosition": 180,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -407,7 +433,7 @@
"a2XMSKROCl9z"
],
"title": "v0.91.1-beta",
- "notePosition": 180,
+ "notePosition": 190,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -425,7 +451,7 @@
"yqXFvWbLkuMD"
],
"title": "v0.90.12",
- "notePosition": 190,
+ "notePosition": 200,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -443,7 +469,7 @@
"veS7pg311yJP"
],
"title": "v0.90.11-beta",
- "notePosition": 200,
+ "notePosition": 210,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -461,7 +487,7 @@
"sq5W9TQxRqMq"
],
"title": "v0.90.10-beta",
- "notePosition": 210,
+ "notePosition": 220,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -479,7 +505,7 @@
"yFEGVCUM9tPx"
],
"title": "v0.90.9-beta",
- "notePosition": 220,
+ "notePosition": 230,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -497,7 +523,7 @@
"o4wAGqOQuJtV"
],
"title": "v0.90.8",
- "notePosition": 230,
+ "notePosition": 240,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -530,7 +556,7 @@
"i4A5g9iOg9I0"
],
"title": "v0.90.7-beta",
- "notePosition": 240,
+ "notePosition": 250,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -548,7 +574,7 @@
"ThNf2GaKgXUs"
],
"title": "v0.90.6-beta",
- "notePosition": 250,
+ "notePosition": 260,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -566,7 +592,7 @@
"G4PAi554kQUr"
],
"title": "v0.90.5-beta",
- "notePosition": 260,
+ "notePosition": 270,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -593,7 +619,7 @@
"zATRobGRCmBn"
],
"title": "v0.90.4",
- "notePosition": 270,
+ "notePosition": 280,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -611,7 +637,7 @@
"sCDLf8IKn3Iz"
],
"title": "v0.90.3",
- "notePosition": 280,
+ "notePosition": 290,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -629,7 +655,7 @@
"VqqyBu4AuTjC"
],
"title": "v0.90.2-beta",
- "notePosition": 290,
+ "notePosition": 300,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -647,7 +673,7 @@
"RX3Nl7wInLsA"
],
"title": "v0.90.1-beta",
- "notePosition": 300,
+ "notePosition": 310,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -665,7 +691,7 @@
"GyueACukPWjk"
],
"title": "v0.90.0-beta",
- "notePosition": 310,
+ "notePosition": 320,
"prefix": null,
"isExpanded": false,
"type": "text",
@@ -683,7 +709,7 @@
"wyurrlcDl416"
],
"title": "Release Template",
- "notePosition": 320,
+ "notePosition": 330,
"prefix": null,
"isExpanded": false,
"type": "text",
diff --git a/docs/Release Notes/Release Notes/v0.94.1.md b/docs/Release Notes/Release Notes/v0.94.1.md
index bb8d73ed7..5662cfedf 100644
--- a/docs/Release Notes/Release Notes/v0.94.1.md
+++ b/docs/Release Notes/Release Notes/v0.94.1.md
@@ -1,6 +1,6 @@
# v0.94.1
> [!NOTE]
-> _Trilium Notes_ will rebrand itself back to Trilium Notes since @zadam was kind enough to give us the original name. See [#2190](https://github.com/orgs/TriliumNext/discussions/2190) for more info. This will probably be the "last" version branded as Trilium Notes_.
+> _Trilium Notes_ will rebrand itself back to Trilium Notes since @zadam was kind enough to give us the original name. See [#2190](https://github.com/orgs/TriliumNext/discussions/2190) for more info. This will probably be the "last" version branded as Trilium Notes\_.
> [!IMPORTANT]
> If you enjoyed this release, consider showing a token of appreciation by:
diff --git a/docs/Release Notes/Release Notes/v0.96.0.md b/docs/Release Notes/Release Notes/v0.96.0.md
new file mode 100644
index 000000000..eb4ebdacc
--- /dev/null
+++ b/docs/Release Notes/Release Notes/v0.96.0.md
@@ -0,0 +1,51 @@
+# v0.96.0
+
+> [!NOTE]
+> The Docker image has been relocated to `triliumnext/trilium`. Please update your configuration accordingly.
+
+> [!IMPORTANT]
+> If you enjoyed this release, consider showing a token of appreciation by:
+>
+> * Pressing the βStarβ button on [GitHub](https://github.com/TriliumNext/Notes) (top-right).
+> * Considering a one-time or recurrent donation to the [lead developer](https://github.com/eliandoran) via [GitHub Sponsors](https://github.com/sponsors/eliandoran) or [PayPal](https://paypal.me/eliandoran).
+
+## π‘ Key highlights
+
+* Thanks to a partnership with CKEditor, we now have a set of features that would otherwise be available on a commercial license only.
+ * Slash commands for easy commands via the keyboard.
+ * Text snippets to insert reusable pieces of text (similar to templates, but for blocks of text content).
+ * For more information, see the user guide β Note Types β Text β Premium features.
+
+## π Bugfixes
+
+* [βInsert note afterβ long-press dialog doesnβt create Note](https://github.com/TriliumNext/Notes/issues/2246)
+* Code notes: user's font selection not respected.
+* [Windows V0.95.0 Client Failed to sync with server (use of double-slashes)](https://github.com/TriliumNext/Notes/issues/2339) by @perfectra1n
+* Desktop client not working on older Linux distros
+* [NOT NULL constraint failed: revisions.title when saving an empty note](https://github.com/TriliumNext/Trilium/issues/6103)
+
+## β¨ Improvements
+
+* [Elixir language syntax highlighting for text notes](https://github.com/TriliumNext/Notes/pull/2327) (by @jshprentz) and code notes.
+* [Autocomplete: support specifying path when creating a new note](https://github.com/TriliumNext/Notes/pull/2342) by @SiriusXT
+* Markdown import: basic support for importing wikilinks
+* Text notes:
+ * Allow disabling emoji auto-completion from settings.
+ * Allow disabling note auto-completion from settings.
+* [Backend scripts: re-enable dayjs plugins by default](https://github.com/TriliumNext/Trilium/issues/6080)
+
+## π Documentation
+
+* [regex search / Nix flake / restore dev docs](https://github.com/TriliumNext/Notes/pull/2341) by @FliegendeWurst
+* New premium features in text note type.
+
+## π Internationalization
+
+* Spanish improvements by @hasecilu
+
+## π οΈ Technical updates
+
+* flake: fix Electron version, fix Wayland support, fix source filter by @FliegendeWurst
+* Improvements to the landing page (under development) by @FliegendeWurst
+* Updated Node.js to v22.17.0
+* Updated CKEditor to v45.2.1
\ No newline at end of file
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index 71f810477..fbaf730c6 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -4350,6 +4350,13 @@
"type": "text",
"mime": "text/markdown",
"attributes": [
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "rJ9grSgoExl9",
+ "isInheritable": false,
+ "position": 10
+ },
{
"type": "label",
"name": "shareAlias",
@@ -4363,13 +4370,6 @@
"value": "bx bxl-markdown",
"isInheritable": false,
"position": 50
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "rJ9grSgoExl9",
- "isInheritable": false,
- "position": 60
}
],
"format": "markdown",
@@ -5113,23 +5113,23 @@
{
"type": "relation",
"name": "internalLink",
- "value": "nRhnJkTT8cPs",
+ "value": "rJ9grSgoExl9",
"isInheritable": false,
"position": 10
},
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "nRhnJkTT8cPs",
+ "isInheritable": false,
+ "position": 20
+ },
{
"type": "label",
"name": "iconClass",
"value": "bx bx-info-circle",
"isInheritable": false,
"position": 10
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "rJ9grSgoExl9",
- "isInheritable": false,
- "position": 20
}
],
"format": "markdown",
diff --git a/package.json b/package.json
index 656870e4a..3bb89b0b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@triliumnext/source",
- "version": "0.95.0",
+ "version": "0.96.0",
"description": "Build your personal knowledge base with Trilium Notes",
"directories": {
"doc": "docs"
diff --git a/packages/ckeditor5/src/plugins/move_block_updown.ts b/packages/ckeditor5/src/plugins/move_block_updown.ts
index dc5a8958c..32a5c39a1 100644
--- a/packages/ckeditor5/src/plugins/move_block_updown.ts
+++ b/packages/ckeditor5/src/plugins/move_block_updown.ts
@@ -1,5 +1,5 @@
/**
- * https://github.com/TriliumNext/Notes/issues/1002
+ * https://github.com/TriliumNext/Trilium/issues/1002
*/
import { Command, DocumentSelection, Element, Node, Plugin, Range } from 'ckeditor5';
@@ -11,11 +11,11 @@ export default class MoveBlockUpDownPlugin extends Plugin {
editor.commands.add('moveBlockUp', new MoveBlockUpCommand(editor));
editor.commands.add('moveBlockDown', new MoveBlockDownCommand(editor));
- // Use native DOM capturing to intercept Ctrl/Alt + β/β,
+ // Use native DOM capturing to intercept Ctrl/Alt + β/β,
// as plugin-level keystroke handling may fail when the selection is near an object.
this.bindMoveBlockShortcuts(editor);
}
-
+
bindMoveBlockShortcuts(editor: any) {
editor.editing.view.once('render', () => {
const domRoot = editor.editing.view.getDomRoot();
@@ -59,7 +59,7 @@ abstract class MoveBlockUpDownCommand extends Command {
if (!isEnabled) {
return;
}
-
+
const movingBlocks = this.offset === 'before'
? selectedBlocks
: [...selectedBlocks].reverse();
@@ -104,7 +104,7 @@ abstract class MoveBlockUpDownCommand extends Command {
this.scrollToSelection();
});
}
-
+
getSelectedBlocks(selection: DocumentSelection) {
const blocks = [...selection.getSelectedBlocks()];
const resolved: Element[] = [];
@@ -129,7 +129,7 @@ abstract class MoveBlockUpDownCommand extends Command {
// Deduplicate adjacent duplicates (e.g., nested selections resolving to same block)
return resolved.filter((blk, idx) => idx === 0 || blk !== resolved[idx - 1]);
}
-
+
scrollToSelection() {
// Ensure scroll happens in sync with DOM updates
requestAnimationFrame(() => {
diff --git a/packages/commons/package.json b/packages/commons/package.json
index cc3d8961d..2bccaf60c 100644
--- a/packages/commons/package.json
+++ b/packages/commons/package.json
@@ -1,6 +1,6 @@
{
"name": "@triliumnext/commons",
- "version": "0.95.0",
+ "version": "0.96.0",
"description": "Shared library between the clients (e.g. browser, Electron) and the server, mostly for type definitions and utility methods.",
"private": true,
"type": "module",
diff --git a/scripts/generate-openapi.ts b/scripts/generate-openapi.ts
index 4c9ea2a0c..0a5d6a861 100644
--- a/scripts/generate-openapi.ts
+++ b/scripts/generate-openapi.ts
@@ -23,10 +23,10 @@ const options = {
title: "Trilium Notes - Sync server API",
version: packageJson["version"],
description:
- "This is the internal sync server API used by Trilium Notes.\n\n_If you're looking for the officially supported External Trilium API, see [here](https://triliumnext.github.io/Docs/Wiki/etapi.html)._\n\nThis page does not yet list all routes. For a full list, see the [route controller](https://github.com/TriliumNext/Notes/blob/v0.91.6/src/routes/routes.ts).",
+ "This is the internal sync server API used by Trilium Notes.\n\n_If you're looking for the officially supported External Trilium API, see [here](https://triliumnext.github.io/Docs/Wiki/etapi.html)._\n\nThis page does not yet list all routes. For a full list, see the [route controller](https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/routes/routes.ts).",
contact: {
name: "TriliumNext issue tracker",
- url: "https://github.com/TriliumNext/Notes/issues"
+ url: "https://github.com/TriliumNext/Trilium/issues"
},
license: {
name: "GNU Free Documentation License 1.3 (or later)",
@@ -159,7 +159,7 @@ console.log("Saved to", outputPath);
* type: string
* example: "text"
* enum: ["text", "code", "render", "file", "image", "search", "relationMap", "book", "noteMap", "mermaid", "canvas", "webView", "launcher", "doc", "contentWidget", "mindMap", "geoMap"]
- * description: "[Reference list](https://github.com/TriliumNext/Notes/blob/v0.91.6/src/services/note_types.ts)"
+ * description: "[Reference list](https://github.com/TriliumNext/Trilium/blob/v0.91.6/src/services/note_types.ts)"
* mime:
* type: string
* example: "text/html"
diff --git a/scripts/port-discussions.ts b/scripts/port-discussions.ts
index ab743727a..9b4a83221 100644
--- a/scripts/port-discussions.ts
+++ b/scripts/port-discussions.ts
@@ -10,7 +10,7 @@
import { type BrowserContext, chromium } from 'playwright';
import { createWriteStream, existsSync, readFileSync, writeFileSync } from 'fs';
-const SOURCE_URL = "https://github.com/TriliumNext/Notes";
+const SOURCE_URL = "https://github.com/TriliumNext/Trilium";
const TARGET_REPOSITORY_ID = 92111509;
const fsLog = createWriteStream('port-discussions.log', { flags: 'a' });