Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/server_esm…
Browse files Browse the repository at this point in the history
…_part3
  • Loading branch information
eliandoran committed Jul 27, 2024
2 parents f382d3c + 1a5649e commit 7b2d70b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
"i18n-ally.localesPaths": [
"./src/public/translations"
],
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
}
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [[email protected]](mailto:[email protected])
2 changes: 2 additions & 0 deletions bin/copy-dist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 7b2d70b

Please sign in to comment.