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

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
zadam 2023-01-24 09:20:15 +01:00
commit 2e9dbda077
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.zip
View File

Binary file not shown.

2
db/migrations/0200__create_hidden_subtree.js
View File

@ -7,6 +7,6 @@ module.exports = () => {
beccaLoader.load(); beccaLoader.load();
// make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...) // make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...)
// in previous releases hidden subtree was created lazily // in previous releases hidden subtree was created lazily
hiddenSubtreeService.checkHiddenSubtree(); hiddenSubtreeService.checkHiddenSubtree(true);
}); });
}; };

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.58.4", "version": "0.58.7",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

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

@ -242,6 +242,7 @@ const ATTR_HELP = {
"keepCurrentHoisting": "Opening this link won't change hoisting even if the note is not displayable in the current hoisted subtree.", "keepCurrentHoisting": "Opening this link won't change hoisting even if the note is not displayable in the current hoisted subtree.",
"executeButton": "Title of the button which will execute the current code note", "executeButton": "Title of the button which will execute the current code note",
"executeDescription": "Longer description of the current code note displayed together with the execute button", "executeDescription": "Longer description of the current code note displayed together with the execute button",
"excludeFromNoteMap": "Notes with this label will be hidden from the Note Map"
}, },
"relation": { "relation": {
"runOnNoteCreation": "executes when note is created on backend. Use this relation if you want to run the script for all notes created under a specific subtree. In that case, create it on the subtree root note and make it inheritable. A new note created within the subtree (any depth) will trigger the script.", "runOnNoteCreation": "executes when note is created on backend. Use this relation if you want to run the script for all notes created under a specific subtree. In that case, create it on the subtree root note and make it inheritable. A new note created within the subtree (any depth) will trigger the script.",

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2023-01-16T22:39:28+01:00", buildRevision: "9fd0b85ff2be264be35ec2052c956b654f0dac9e" }; module.exports = { buildDate:"2023-01-17T23:14:58+01:00", buildRevision: "a3149aecf41bac3c559ebbd1865e916264985ac3" };

4
src/services/hidden_subtree.js
View File

@ -240,8 +240,8 @@ const HIDDEN_SUBTREE_DEFINITION = {
] ]
}; };
function checkHiddenSubtree() { function checkHiddenSubtree(force = false) {
if (!migrationService.isDbUpToDate()) { if (!force && !migrationService.isDbUpToDate()) {
// on-delete hook might get triggered during some future migration and cause havoc // on-delete hook might get triggered during some future migration and cause havoc
log.info("Will not check hidden subtree until migration is finished."); log.info("Will not check hidden subtree until migration is finished.");
return; return;