mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 21:11:30 +08:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into dev
# Conflicts: # package.json
This commit is contained in:
		
						commit
						2e9dbda077
					
				
							
								
								
									
										
											BIN
										
									
								
								db/demo.zip
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								db/demo.zip
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -7,6 +7,6 @@ module.exports = () => { | ||||
|         beccaLoader.load(); | ||||
|         // 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
 | ||||
|         hiddenSubtreeService.checkHiddenSubtree(); | ||||
|         hiddenSubtreeService.checkHiddenSubtree(true); | ||||
|     }); | ||||
| }; | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
|   "name": "trilium", | ||||
|   "productName": "Trilium Notes", | ||||
|   "description": "Trilium Notes", | ||||
|   "version": "0.58.4", | ||||
|   "version": "0.58.7", | ||||
|   "license": "AGPL-3.0-only", | ||||
|   "main": "electron.js", | ||||
|   "bin": { | ||||
|  | ||||
| @ -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.", | ||||
|         "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", | ||||
|         "excludeFromNoteMap": "Notes with this label will be hidden from the Note Map" | ||||
|     }, | ||||
|     "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.", | ||||
|  | ||||
| @ -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" }; | ||||
|  | ||||
| @ -240,8 +240,8 @@ const HIDDEN_SUBTREE_DEFINITION = { | ||||
|     ] | ||||
| }; | ||||
| 
 | ||||
| function checkHiddenSubtree() { | ||||
|     if (!migrationService.isDbUpToDate()) { | ||||
| function checkHiddenSubtree(force = false) { | ||||
|     if (!force && !migrationService.isDbUpToDate()) { | ||||
|         // on-delete hook might get triggered during some future migration and cause havoc
 | ||||
|         log.info("Will not check hidden subtree until migration is finished."); | ||||
|         return; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam