Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,9 +5,9 @@ labels: "Type: Bug"
 body:
 - type: input
   attributes:
-    label: Trilium Version
+    label: TriliumNext Version
-    description: What version of Trilium are you using?
+    description: What version of TriliumNext are you using?
-    placeholder: 0.57.0-beta
+    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

.vscode/settings.json

@@ -8,4 +8,7 @@
     "i18n-ally.localesPaths": [
         "./src/public/translations"
     ],
+    "[jsonc]": {
+        "editor.defaultFormatter": "vscode.json-language-features"
+    },
 }

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)

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) {