From 379c07a7fae8f21837bebec9800249250b775342 Mon Sep 17 00:00:00 2001 From: MeIchthys Date: Wed, 24 Jul 2024 09:49:50 -0400 Subject: [PATCH 1/4] Update issue template to use new version scheme and TriliumNext Documentation links --- .github/ISSUE_TEMPLATE/bug_report.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 895793470..28347d8b6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -5,9 +5,9 @@ labels: "Type: Bug" body: - type: input attributes: - label: Trilium Version - description: What version of Trilium are you using? - placeholder: 0.57.0-beta + label: TriliumNext Version + description: What version of TriliumNext are you using? + placeholder: 0.90.0-beta validations: required: true - type: dropdown @@ -24,7 +24,7 @@ body: - type: dropdown attributes: label: What is your setup? - description: https://github.com/zadam/trilium/wiki#choose-the-setup + description: https://triliumnext.github.io/Docs/Wiki/quick-start.html options: - Local (no sync) - Local + server sync @@ -47,6 +47,6 @@ body: - type: textarea attributes: label: Error logs - description: Please provide error logs, see [wiki page](https://github.com/zadam/trilium/wiki/Error-logs) for instructions on how to submit them. + description: Please provide error logs, see [wiki page](https://triliumnext.github.io/Docs/Wiki/error-logs.html) for instructions on how to submit them. validations: required: false From 25db092b4139b1f401c7903bcf21a2cfadfe5bc8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 24 Jul 2024 21:04:20 +0300 Subject: [PATCH 2/4] electron: Fix crash due to missing i18next --- bin/copy-dist.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/copy-dist.ts b/bin/copy-dist.ts index 3c80598c3..62314fcb9 100644 --- a/bin/copy-dist.ts +++ b/bin/copy-dist.ts @@ -66,6 +66,8 @@ const copy = async () => { "node_modules/print-this/", "node_modules/split.js/dist/", "node_modules/panzoom/dist/", + "node_modules/i18next/", + "node_modules/i18next-http-backend/" ]; for (const folder of nodeModulesFolder) { From dc48eeb7c18d47b479aa57e655c5abe82670e617 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 25 Jul 2024 00:30:51 +0300 Subject: [PATCH 3/4] dev: Set up default JSON formatter on VS Code --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 01d9b230e..f2a732507 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,4 +8,7 @@ "i18n-ally.localesPaths": [ "./src/public/translations" ], + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, } From b508b5bbfd99d7e3e3a32e45ca134970d25a461c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 25 Jul 2024 00:31:42 +0300 Subject: [PATCH 4/4] Update SECURITY.md --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index 55ea001dc..0c7e17bd6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,4 +10,4 @@ Description above is a general rule and may be altered on case by case basis. ## Reporting a Vulnerability -You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com +You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [contact@eliandoran.me](mailto:contact@eliandoran.me)