Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							380b967407 
							
						 
					 
					
						
						
							
							Configure author & description for maker-squirrel  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-08 21:40:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							145a09edd1 
							
						 
					 
					
						
						
							
							Set up Electron Forge  
						
						 
						
						... 
						
						
						
						This should allow us to package Trilium for multiple platforms,
including generating a Windows installer which is our current target. 
						
						
							
						
					 
					
						2023-11-08 21:28:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							b07628abda 
							
						 
					 
					
						
						
							
							Remove electron-builder dependency  
						
						 
						
						... 
						
						
						
						The `electron-builder` dependency was introduced a while ago in #289 ,
but finally removed bcbbf4dc3eb9f75b561cb3af99e200bc709c5388 so there
should be no reason to keep it around. 
						
						
							
						
					 
					
						2023-11-08 21:21:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e9ece21d20 
							
						 
					 
					
						
						
							
							release 0.62.0-beta  
						
						 
						
						
						
						
							
  v0.62.0-beta
 
						
					 
					
						2023-11-06 23:13:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b700f069fe 
							
						 
					 
					
						
						
							
							reduce flickering while hoisted  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 23:11:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							40fb6aa168 
							
						 
					 
					
						
						
							
							move the unhoist button to the right  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 22:28:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							341480e7cf 
							
						 
					 
					
						
						
							
							scroll padding widget only on text and code notes  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 22:26:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							bde311fd76 
							
						 
					 
					
						
						
							
							upgrades  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 22:23:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f8bc03feaf 
							
						 
					 
					
						
						
							
							Merge branch 'stable'  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 22:14:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7fc1eb5262 
							
						 
					 
					
						
						
							
							release 0.61.13  
						
						 
						
						
						
						
							
  v0.61.13
 
						
					 
					
						2023-11-06 00:21:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							531e9d4aff 
							
						 
					 
					
						
						
							
							graceful handling of sync error  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-06 00:15:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d4766c2d 
							
						 
					 
					
						
						
							
							fix recursion in the inline image processing  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-05 21:50:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ab4e83771c 
							
						 
					 
					
						
						
							
							fix throwing empty error  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-04 22:53:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							803b6df40c 
							
						 
					 
					
						
						
							
							release 0.61.12  
						
						 
						
						
						
						
							
  v0.61.12
 
						
					 
					
						2023-11-04 00:16:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1ebdb0f5e1 
							
						 
					 
					
						
						
							
							emergency disabling of image compression since it appears to make problems in migration to 0.61  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-04 00:10:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							df5951ce46 
							
						 
					 
					
						
						
							
							improve sync debug info  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-04 00:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							809ffa0c6e 
							
						 
					 
					
						
						
							
							small refactor of ordinal() func  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 13:49:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd466ddaf 
							
						 
					 
					
						
						
							
							updates  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 12:23:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a45b801a84 
							
						 
					 
					
						
						
							
							reverted incomplete work on export per-directory metadata  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 12:18:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f8ade4d0c5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 12:15:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							889cb1d7b1 
							
						 
					 
					
						
						
							
							Merge branch 'stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package.json 
						
						
							
						
					 
					
						2023-11-03 12:15:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d3a477b8f2 
							
						 
					 
					
						
						
							
							release 0.61.11  
						
						 
						
						
						
						
							
  v0.61.11
 
						
					 
					
						2023-11-03 11:46:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4db042736c 
							
						 
					 
					
						
						
							
							Merge pull request  #4371  from rauenzi/pwa-manifest  
						
						 
						
						... 
						
						
						
						Update webmanifest for wider compatibility 
						
						
							
						
					 
					
						2023-11-03 11:25:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							612e4406b5 
							
						 
					 
					
						
						
							
							refactored TOC and Highlights close buttons and added a button to quickly access options  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 10:44:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							76f874ef6d 
							
						 
					 
					
						
						
							
							refactoring of the complex note tree entitiesReloadedEvent  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 08:58:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f37f47ce5b 
							
						 
					 
					
						
						
							
							fixes to stable sorting  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-03 01:11:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							45ed436426 
							
						 
					 
					
						
						
							
							added runOnBranchChange event  #4108  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-02 23:26:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zack Rauen 
							
						 
					 
					
						
						
						
						
							
						
						
							9314cf87c5 
							
						 
					 
					
						
						
							
							Update manifest for wider compatibility  
						
						 
						
						... 
						
						
						
						Partially fixes  #920  
						
						
							
						
					 
					
						2023-11-01 12:30:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0efc42081d 
							
						 
					 
					
						
						
							
							more tests  
						
						 
						
						
						
						
							
						
					 
					
						2023-11-01 00:41:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7d80fe19e0 
							
						 
					 
					
						
						
							
							add backend API methods to access options, attachments, revisions, etapi tokens  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-31 22:26:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							de8c351e25 
							
						 
					 
					
						
						
							
							reduce indent of TOC when larger headings are not being used,  fixes   #4363  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-31 00:18:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							695c9d5cf3 
							
						 
					 
					
						
						
							
							more note etapi tests  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-30 23:51:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8690228d98 
							
						 
					 
					
						
						
							
							etapi test infrastructure plus a basic note creation test  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-29 23:24:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							01093d05d7 
							
						 
					 
					
						
						
							
							qswitch-electron, qswitch-server npm scripts  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-29 18:39:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							690caf7da1 
							
						 
					 
					
						
						
							
							Merge branch 'beta'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json 
						
						
							
						
					 
					
						2023-10-29 16:43:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b63111ae 
							
						 
					 
					
						
						
							
							qstart-electron, qstart-server npm scripts  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-29 16:42:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							eb0a68d0ab 
							
						 
					 
					
						
						
							
							note list should show the prefix,  #4362  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-29 01:02:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							48e98b2ac3 
							
						 
					 
					
						
						
							
							add api.runAsyncOnBackendWithManualTransactionHandling() variant and add toast warnings about improper usage.  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-29 00:51:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ed1a731950 
							
						 
					 
					
						
						
							
							extra hint on "noproxy directly in the setting",  #3934  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-24 23:15:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4660c154e9 
							
						 
					 
					
						
						
							
							refactor  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-24 23:10:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ef974ab1f5 
							
						 
					 
					
						
						
							
							add shell as enabled by default  #4347  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-24 23:00:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							bacae67374 
							
						 
					 
					
						
						
							
							fix import  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-24 00:14:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							cc20d17bd2 
							
						 
					 
					
						
						
							
							npm upgrades && docs  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-24 00:13:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							494b240015 
							
						 
					 
					
						
						
							
							Merge branch 'beta'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/public/app/layouts/desktop_layout.js 
						
						
							
						
					 
					
						2023-10-24 00:09:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1cd391a132 
							
						 
					 
					
						
						
							
							mermaid 10.5.1  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-22 23:57:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1c15527d95 
							
						 
					 
					
						
						
							
							added "greater than 0" and "less than 2" for ancestor depth,  fixes   #4343  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-22 23:52:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7af79ec33b 
							
						 
					 
					
						
						
							
							limit mermaid width,  #4340  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-21 23:24:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4294c043d8 
							
						 
					 
					
						
						
							
							enabled CKEditor HTML support  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-21 23:19:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b925abf8 
							
						 
					 
					
						
						
							
							added extra elements to the html sanitizer  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-21 18:03:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							90c0a4a437 
							
						 
					 
					
						
						
							
							respect safeImport flag when sanitizing imported content  
						
						 
						
						
						
						
							
						
					 
					
						2023-10-21 17:54:07 +02:00