zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							99a5774148 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next58  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
					 
					
						2022-12-03 13:01:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							42cd333694 
							
						 
					 
					
						
						
							
							clarification on the 5 minute sync auth leeway  
						
						 
						
						
						
						
					 
					
						2022-12-02 22:12:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0e68e8069b 
							
						 
					 
					
						
						
							
							launcher improvements  
						
						 
						
						
						
						
					 
					
						2022-12-01 16:22:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							fc080f785b 
							
						 
					 
					
						
						
							
							moving components to its own directory  
						
						 
						
						
						
						
					 
					
						2022-12-01 13:07:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6c9be065 
							
						 
					 
					
						
						
							
							renamed shortcuts to launchers  
						
						 
						
						
						
						
					 
					
						2022-12-01 10:16:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b55c2d3dbc 
							
						 
					 
					
						
						
							
							shortcut improvements  
						
						 
						
						
						
						
					 
					
						2022-12-01 10:03:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e759b4846a 
							
						 
					 
					
						
						
							
							shortcut improvements  
						
						 
						
						
						
						
					 
					
						2022-11-29 16:16:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6a9ac6f90a 
							
						 
					 
					
						
						
							
							shortcuts improvements  
						
						 
						
						
						
						
					 
					
						2022-11-26 14:57:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6883b71ce7 
							
						 
					 
					
						
						
							
							shortcut improvements  
						
						 
						
						
						
						
					 
					
						2022-11-25 15:29:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							19126b7c6d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next58  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js 
						
						
					 
					
						2022-11-22 20:46:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							02d908df1e 
							
						 
					 
					
						
						
							
							added option to disable tray,  closes   #2612  
						
						 
						
						
						
						
					 
					
						2022-11-18 21:47:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4961d9bb89 
							
						 
					 
					
						
						
							
							avoid errors on dead backlinks,  #3289  
						
						 
						
						
						
						
					 
					
						2022-11-14 21:03:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							76f34e3eaf 
							
						 
					 
					
						
						
							
							small tweaks of linewrap option  
						
						 
						
						
						
						
					 
					
						2022-11-08 22:55:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							acf3f5013c 
							
						 
					 
					
						
						
							
							Merge pull request  #3299  from Banbury/code-options-linebreak  
						
						 
						
						... 
						
						
						
						Added option to toggle line wrapping for Code notes 
						
						
					 
					
						2022-11-08 22:49:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							60fc621cd4 
							
						 
					 
					
						
						
							
							add keyboard action to force creating note revisions,  #2147  
						
						 
						
						
						
						
					 
					
						2022-11-08 22:36:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							68eb04741d 
							
						 
					 
					
						
						
							
							remove console.log  
						
						 
						
						
						
						
					 
					
						2022-11-08 21:27:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Banbury 
							
						 
					 
					
						
						
						
						
							
						
						
							1037d814ec 
							
						 
					 
					
						
						
							
							Added option to toggle line wrapping for Code notes  
						
						 
						
						
						
						
					 
					
						2022-11-08 14:48:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb368c4de 
							
						 
					 
					
						
						
							
							search link map will display only direct results  
						
						 
						
						
						
						
					 
					
						2022-11-07 23:56:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							df9f6ce33a 
							
						 
					 
					
						
						
							
							link map improvements  
						
						 
						
						
						
						
					 
					
						2022-11-07 23:19:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d29a633529 
							
						 
					 
					
						
						
							
							fix  
						
						 
						
						
						
						
					 
					
						2022-11-07 21:11:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8b0c60a046 
							
						 
					 
					
						
						
							
							improvements to notemap in relation to search  
						
						 
						
						
						
						
					 
					
						2022-11-05 22:32:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8a539dc514 
							
						 
					 
					
						
						
							
							don't filter on root hoisted note  
						
						 
						
						
						
						
					 
					
						2022-11-03 21:40:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4b72606d 
							
						 
					 
					
						
						
							
							Filter "Edited Notes" when hoisted or in a workspace  
						
						 
						
						... 
						
						
						
						Previously, when the user opened a day note the "Edited Notes" section would indicate all
the notes edited in that day, regardless of whether the user was inside a workspace or
hoisted a note.
Now the "Edited Notes" section filters out the notes if the user has a hoisted note. 
						
						
					 
					
						2022-11-03 20:28:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							75bd38885b 
							
						 
					 
					
						
						
							
							use trilium version number in asset paths to avoid caching issues  
						
						 
						
						
						
						
					 
					
						2022-10-27 20:34:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							12943cc808 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next57  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
					 
					
						2022-10-23 21:13:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							14fb9c76b0 
							
						 
					 
					
						
						
							
							fix backlinks in day note subtree,  fixes   #3158  
						
						 
						
						
						
						
					 
					
						2022-10-22 15:01:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							c16f7a5e02 
							
						 
					 
					
						
						
							
							Merge branch 'master' into next55  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js 
						
						
					 
					
						2022-10-15 12:09:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5a3c50d9fb 
							
						 
					 
					
						
						
							
							extra null relation checks in notemap  
						
						 
						
						
						
						
					 
					
						2022-10-08 22:24:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0c196ae3a5 
							
						 
					 
					
						
						
							
							fix deleting / erasing note  
						
						 
						
						
						
						
					 
					
						2022-09-21 23:58:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b816773d02 
							
						 
					 
					
						
						
							
							add #workspaceTemplate which works as workspace-scoped template,  closes   #3137  
						
						 
						
						
						
						
					 
					
						2022-09-16 22:44:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a63afc28 
							
						 
					 
					
						
						
							
							limit max imported file size to 250 MiB,  #3108  
						
						 
						
						
						
						
					 
					
						2022-09-03 15:11:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7109a12afd 
							
						 
					 
					
						
						
							
							Merge branch 'stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	bin/release-flatpack.sh 
						
						
					 
					
						2022-08-27 13:19:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5b73fe949e 
							
						 
					 
					
						
						
							
							defensive programming,  #3089  
						
						 
						
						
						
						
					 
					
						2022-08-26 22:08:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ad8b7f67b1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
						
					 
					
						2022-08-22 19:27:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sigaloid 
							
						 
					 
					
						
						
						
						
							
						
						
							c85ec957ec 
							
						 
					 
					
						
						
							
							Filter excludeFromNoteMap from backlinks  
						
						 
						
						
						
						
					 
					
						2022-08-18 23:12:58 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8abcf571e8 
							
						 
					 
					
						
						
							
							fixes for undefined parent note  #3066  
						
						 
						
						
						
						
					 
					
						2022-08-16 23:46:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							ddb57e35f3 
							
						 
					 
					
						
						
							
							Fix relation map crash on missing inverse pair ( fixes   #3055 )  
						
						 
						
						
						
						
					 
					
						2022-08-14 04:30:00 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							fc920becac 
							
						 
					 
					
						
						
							
							launchbar WIP  
						
						 
						
						
						
						
					 
					
						2022-08-07 13:23:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							869c910801 
							
						 
					 
					
						
						
							
							fix "bulk actions" dialog title  
						
						 
						
						
						
						
					 
					
						2022-08-03 19:17:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							8a39699acd 
							
						 
					 
					
						
						
							
							fix note map with noteId = 'none'  
						
						 
						
						
						
						
					 
					
						2022-08-02 17:01:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sigaloid 
							
						 
					 
					
						
						
						
						
							
						
						
							f3662d1048 
							
						 
					 
					
						
						
							
							Add network configuration  
						
						 
						
						
						
						
					 
					
						2022-07-19 16:01:27 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							57c5b6d61f 
							
						 
					 
					
						
						
							
							added an option to define a "min TOC headings",  #2985  
						
						 
						
						
						
						
					 
					
						2022-07-16 00:15:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							570fabdc4a 
							
						 
					 
					
						
						
							
							add highlighting to search results,  closes   #2977  
						
						 
						
						
						
						
					 
					
						2022-07-10 15:52:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9b4ef6ea5e 
							
						 
					 
					
						
						
							
							fix node size in a note map when note has hidden image notes,  closes   #2965  
						
						 
						
						
						
						
					 
					
						2022-07-09 13:27:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c724aa00 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
					 
					
						2022-07-08 22:21:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							12b3302687 
							
						 
					 
					
						
						
							
							sanitize note title && attrs just to be sure  
						
						 
						
						
						
						
					 
					
						2022-07-06 23:09:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							dbf1ac1e9d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/services/build.js 
						
						
					 
					
						2022-07-01 22:34:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							3faae63b84 
							
						 
					 
					
						
						
							
							set correct content type for error messages  
						
						 
						
						
						
						
					 
					
						2022-07-01 00:01:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5ca7e39852 
							
						 
					 
					
						
						
							
							fix putting new attribute correctly into becca  
						
						 
						
						
						
						
					 
					
						2022-06-17 23:04:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							df3fdb59c5 
							
						 
					 
					
						
						
							
							fix saving note revisions,  closes   #2915  
						
						 
						
						
						
						
					 
					
						2022-06-13 22:54:08 +02:00