Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 7b2d70b

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3
2 parents f382d3c + 1a5649e commit 7b2d70b

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ labels: "Type: Bug"
55
body:
66
- type: input
77
attributes:
8-
label: Trilium Version
9-
description: What version of Trilium are you using?
10-
placeholder: 0.57.0-beta
8+
label: TriliumNext Version
9+
description: What version of TriliumNext are you using?
10+
placeholder: 0.90.0-beta
1111
validations:
1212
required: true
1313
- type: dropdown
@@ -24,7 +24,7 @@ body:
2424
- type: dropdown
2525
attributes:
2626
label: What is your setup?
27-
description: https://github.com/zadam/trilium/wiki#choose-the-setup
27+
description: https://triliumnext.github.io/Docs/Wiki/quick-start.html
2828
options:
2929
- Local (no sync)
3030
- Local + server sync
@@ -47,6 +47,6 @@ body:
4747
- type: textarea
4848
attributes:
4949
label: Error logs
50-
description: Please provide error logs, see [wiki page](https://github.com/zadam/trilium/wiki/Error-logs) for instructions on how to submit them.
50+
description: Please provide error logs, see [wiki page](https://triliumnext.github.io/Docs/Wiki/error-logs.html) for instructions on how to submit them.
5151
validations:
5252
required: false

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
"i18n-ally.localesPaths": [
99
"./src/public/translations"
1010
],
11+
"[jsonc]": {
12+
"editor.defaultFormatter": "vscode.json-language-features"
13+
},
1114
}

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Description above is a general rule and may be altered on case by case basis.
1010

1111
## Reporting a Vulnerability
1212

13-
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [email protected]
13+
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [[email protected]](mailto:[email protected])

bin/copy-dist.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ const copy = async () => {
6666
"node_modules/print-this/",
6767
"node_modules/split.js/dist/",
6868
"node_modules/panzoom/dist/",
69+
"node_modules/i18next/",
70+
"node_modules/i18next-http-backend/"
6971
];
7072

7173
for (const folder of nodeModulesFolder) {

0 commit comments

Comments
 (0)