zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							346f6edd7e 
							
						 
					 
					
						
						
							
							fix filing entity changes for deleted notes  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-10 08:55:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							92f586486f 
							
						 
					 
					
						
						
							
							Fix broken reference consistency check  
						
						 
						
						... 
						
						
						
						If a branch was identified with a missing parent, the branch would be
moved to root. However, the ID of the branch would be changed as a
result of that, and this resulted in the creation of a new branch
instead of updating the old one. Deleting the old one first solves the
issue. 
						
						
							
						
					 
					
						2023-02-05 01:12:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							15607becc6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/app/entities/fnote.js
#	src/services/notes.js 
						
						
							
						
					 
					
						2023-02-02 23:35:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e7c6d912a4 
							
						 
					 
					
						
						
							
							fix undeleting notes with a relation,  closes   #3583  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-01 23:06:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							290f7e2101 
							
						 
					 
					
						
						
							
							fix sharing of templates,  #3562  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-01 22:58:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							460b5fb3a4 
							
						 
					 
					
						
						
							
							fix sharing of templates,  #3562  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-01 22:55:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							88e09eb279 
							
						 
					 
					
						
						
							
							ocr wip  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-01 21:07:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5e0fbea3b3 
							
						 
					 
					
						
						
							
							fix disabled: on attribtue changed script in demo document,  fixes   #3564  
						
						 
						
						
						
						
							
						
					 
					
						2023-02-01 07:29:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7b2c3afe4c 
							
						 
					 
					
						
						
							
							always open the note in URL,  closes   #3571  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-31 23:20:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2e181d0fb1 
							
						 
					 
					
						
						
							
							toggling the left pane will toggle the focus between tree and detail,  #3563  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-31 22:35:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							68a03211ce 
							
						 
					 
					
						
						
							
							fix padding on launcher when collapsed  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-31 22:25:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							37ba76fdd8 
							
						 
					 
					
						
						
							
							refactored note attachment into note ancillary  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-28 13:13:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							78954268ab 
							
						 
					 
					
						
						
							
							small attribute optimizations  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-27 16:59:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b0528b62d8 
							
						 
					 
					
						
						
							
							small attribute optimizations  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-27 16:57:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2b4dfaef7f 
							
						 
					 
					
						
						
							
							small attribute optimizations  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-27 08:46:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ad887c4b12 
							
						 
					 
					
						
						
							
							added image OCR and parsing text from PDF (and OCR of PDF images)  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-26 20:32:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							63c62df787 
							
						 
					 
					
						
						
							
							ocr  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-26 09:42:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							c68a67d148 
							
						 
					 
					
						
						
							
							ocr test  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-25 15:20:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							bd8568809f 
							
						 
					 
					
						
						
							
							export/import attachments  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-25 09:55:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0bfb2631df 
							
						 
					 
					
						
						
							
							fix saving mermaid attachment  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 23:09:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3c57f08ef7 
							
						 
					 
					
						
						
							
							added checksum to note_attachment  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 16:55:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a7b103e07a 
							
						 
					 
					
						
						
							
							add a button to temporarily hide TOC,  closes   #3555  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 16:24:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							64e7150765 
							
						 
					 
					
						
						
							
							fix undeleting note when its relation points to yet-undeleted note  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 09:43:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a888f9aa04 
							
						 
					 
					
						
						
							
							recalculate maxEntityChangeId after rollbacked transaction  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 09:35:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9dbda077 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package.json 
						
						
							
						
					 
					
						2023-01-24 09:20:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							c474e65cae 
							
						 
					 
					
						
						
							
							saving attachments when editing  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-24 09:19:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f59e19d93b 
							
						 
					 
					
						
						
							
							fixes to note attachment handling  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-23 23:37:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8a33645360 
							
						 
					 
					
						
						
							
							migrating canvas etc.  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-23 16:57:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							339d8a7378 
							
						 
					 
					
						
						
							
							initial implementation of note attachments  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-22 23:36:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a19c56b1 
							
						 
					 
					
						
						
							
							add excludeFromNoteMap to a day template instead of journal root,  #3547  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-21 11:13:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a98fd509c6 
							
						 
					 
					
						
						
							
							release 0.58.7  
						
						 
						
						
						
						
							
  v0.58.7
 
						
					 
					
						2023-01-17 23:14:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a3149aecf4 
							
						 
					 
					
						
						
							
							fix migration for DBs which did not have _hidden tree created,  closes   #3536  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-17 23:13:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6a6ae359b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js 
						
						
							
						
					 
					
						2023-01-17 22:20:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							2fa1d812f6 
							
						 
					 
					
						
						
							
							_hidden note does not inherit attributes from root,  fixes   #3537  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-17 22:14:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ef825371cf 
							
						 
					 
					
						
						
							
							fix "root" note in autocomplete when hoisted into another subtree  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-17 21:15:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b567775129 
							
						 
					 
					
						
						
							
							small fixes of steel blue theme  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-17 21:06:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							58d71bf8e3 
							
						 
					 
					
						
						
							
							release 0.58.6  
						
						 
						
						
						
						
							
  v0.58.6
 
						
					 
					
						2023-01-16 22:39:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9fd0b85ff2 
							
						 
					 
					
						
						
							
							doc note for the back/forward launchers  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-16 22:37:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a5e21ea5f3 
							
						 
					 
					
						
						
							
							simplified/fixed close tab button  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-16 22:28:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							98620887d4 
							
						 
					 
					
						
						
							
							fix demo steel blue main menu icon  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-16 22:19:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9eff08144c 
							
						 
					 
					
						
						
							
							extra check that hidden tree is not created until migration is completed  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-16 08:06:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba72bc8d3 
							
						 
					 
					
						
						
							
							fixed standalone anonymize script  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 21:05:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f50a9c250a 
							
						 
					 
					
						
						
							
							many small issues found by intellij analysis  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 21:04:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							743979266a 
							
						 
					 
					
						
						
							
							fix history navigation buttons in server,  #3527  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 19:46:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4f98c960ec 
							
						 
					 
					
						
						
							
							fix note revision for images  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 19:23:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							424b624ea9 
							
						 
					 
					
						
						
							
							small mermaid fixes  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 13:48:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a004a8b092 
							
						 
					 
					
						
						
							
							fix loading custom themes in Options,  closes   #3528  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-15 12:54:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							df0f52aff9 
							
						 
					 
					
						
						
							
							clarified comment  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-14 23:16:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f7bd72ba2f 
							
						 
					 
					
						
						
							
							release 0.58.5  
						
						 
						
						
						
						
							
  v0.58.5
 
						
					 
					
						2023-01-14 23:02:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							038c0e78a6 
							
						 
					 
					
						
						
							
							fix options check in froca  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-14 23:01:02 +01:00