gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
zadam 2021-04-10 23:23:43 +02:00
parent beb42f18fe
commit 3337487063
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -74,7 +74,7 @@
"jsdoc": "3.6.6", "jsdoc": "3.6.6",
"lorem-ipsum": "2.0.3", "lorem-ipsum": "2.0.3",
"rcedit": "3.0.0", "rcedit": "3.0.0",
"webpack": "5.31.0", "webpack": "5.31.2",
"webpack-cli": "4.6.0" "webpack-cli": "4.6.0"
}, },
"optionalDependencies": { "optionalDependencies": {
@ -9576,9 +9576,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.31.0", "version": "5.31.2",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.2.tgz",
"integrity": "sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ==", "integrity": "sha512-0bCQe4ybo7T5Z0SC5axnIAH+1WuIdV4FwLYkaAlLtvfBhIx8bPS48WHTfiRZS1VM+pSiYt7e/rgLs3gLrH82lQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",
@ -18083,9 +18083,9 @@
"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==" "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
}, },
"webpack": { "webpack": {
"version": "5.31.0", "version": "5.31.2",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.2.tgz",
"integrity": "sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ==", "integrity": "sha512-0bCQe4ybo7T5Z0SC5axnIAH+1WuIdV4FwLYkaAlLtvfBhIx8bPS48WHTfiRZS1VM+pSiYt7e/rgLs3gLrH82lQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",

2
package.json
View File

@ -87,7 +87,7 @@
"jsdoc": "3.6.6", "jsdoc": "3.6.6",
"lorem-ipsum": "2.0.3", "lorem-ipsum": "2.0.3",
"rcedit": "3.0.0", "rcedit": "3.0.0",
"webpack": "5.31.0", "webpack": "5.31.2",
"webpack-cli": "4.6.0" "webpack-cli": "4.6.0"
}, },
"optionalDependencies": { "optionalDependencies": {

4
src/public/app/widgets/attribute_widgets/attribute_detail.js
View File

@ -182,11 +182,11 @@ const ATTR_HELP = {
<ul> <ul>
<li>frontendStartup - when Trilium frontend starts up (or is refreshed).</li> <li>frontendStartup - when Trilium frontend starts up (or is refreshed).</li>
<li>backendStartup - when Trilium backend starts up</li> <li>backendStartup - when Trilium backend starts up</li>
<li>hourly - run once an hour. You can use additional label <code>runAtHours</code> to specify at which hour.</li> <li>hourly - run once an hour. You can use additional label <code>runAtHour</code> to specify at which hour.</li>
<li>daily - run once a day</li> <li>daily - run once a day</li>
</ul>`, </ul>`,
"runOnInstance": "Define which trilium instance should run this on. Default to all instances.", "runOnInstance": "Define which trilium instance should run this on. Default to all instances.",
"runAtHour": "On which hour should this run. Should be used together with <code>#run=hourly</code>", "runAtHour": "On which hour should this run. Should be used together with <code>#run=hourly</code>. Can be defined multiple times for more runs during the day.",
"disableInclusion": "scripts with this label won't be included into parent script execution.", "disableInclusion": "scripts with this label won't be included into parent script execution.",
"sorted": "keeps child notes sorted by title alphabetically", "sorted": "keeps child notes sorted by title alphabetically",
"hidePromotedAttributes": "Hide promoted attributes on this note", "hidePromotedAttributes": "Hide promoted attributes on this note",

2
src/services/attributes.js
View File

@ -26,7 +26,7 @@ const BUILTIN_ATTRIBUTES = [
{ type: 'label', name: 'keyboardShortcut' }, { type: 'label', name: 'keyboardShortcut' },
{ type: 'label', name: 'run', isDangerous: true }, { type: 'label', name: 'run', isDangerous: true },
{ type: 'label', name: 'runOnInstance', isDangerous: false }, { type: 'label', name: 'runOnInstance', isDangerous: false },
{ type: 'label', name: 'runAtHours', isDangerous: false }, { type: 'label', name: 'runAtHour', isDangerous: false },
{ type: 'label', name: 'customRequestHandler', isDangerous: true }, { type: 'label', name: 'customRequestHandler', isDangerous: true },
{ type: 'label', name: 'customResourceProvider', isDangerous: true }, { type: 'label', name: 'customResourceProvider', isDangerous: true },
{ type: 'label', name: 'widget', isDangerous: true }, { type: 'label', name: 'widget', isDangerous: true },