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/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*/` - + @@ -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/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/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/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' });
${t("about.homepage")}https://github.com/TriliumNext/Noteshttps://github.com/TriliumNext/Trilium
${t("about.app_version")}