zadam 
							
						 
					 
					
						
						
							
						
						fd8a2d4d92 
					 
					
						
						
							
							hide global menu after changing note/context  
						
						 
						
						
						
						
					 
					
						2023-03-24 09:32:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						400b14e021 
					 
					
						
						
							
							removed remnants of dev branch  
						
						 
						
						
						
						
					 
					
						2023-02-17 16:44:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						42e08284b0 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js 
						
						
					 
					
						2023-02-15 23:47:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						cbabaa6b0c 
					 
					
						
						
							
							move advanced menu slightly below to not overlay the text  
						
						 
						
						
						
						
					 
					
						2023-02-15 14:49:58 +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 
							
						 
					 
					
						
						
							
						
						b567775129 
					 
					
						
						
							
							small fixes of steel blue theme  
						
						 
						
						
						
						
					 
					
						2023-01-17 21:06:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						957640f163 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-02 22:53:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						115bf0af4d 
					 
					
						
						
							
							fix button paddings  
						
						 
						
						
						
						
					 
					
						2023-01-02 21:08:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						d2b906bc1b 
					 
					
						
						
							
							global menu can open the user guide  
						
						 
						
						
						
						
					 
					
						2022-12-30 17:41:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						7c98ade72b 
					 
					
						
						
							
							fix missing doc resources for launchers,  closes   #3455  
						
						 
						
						
						
						
					 
					
						2022-12-25 11:58:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						1b24276a4a 
					 
					
						
						
							
							always use template strings instead of string concatenation  
						
						 
						
						
						
						
					 
					
						2022-12-21 15:19:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						195c6a4089 
					 
					
						
						
							
							backend log improvements  
						
						 
						
						
						
						
					 
					
						2022-12-15 16:38:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						1b6d0c9bbc 
					 
					
						
						
							
							global menu improvements  
						
						 
						
						
						
						
					 
					
						2022-12-14 10:29:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						173b28062e 
					 
					
						
						
							
							advanced submenu is available in mobile  
						
						 
						
						
						
						
					 
					
						2022-12-13 22:29:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						2957e1d78a 
					 
					
						
						
							
							improvements in mobile layout for launchbar  
						
						 
						
						
						
						
					 
					
						2022-12-12 23:48:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						23322455a3 
					 
					
						
						
							
							mobile layout now has launchbar  
						
						 
						
						
						
						
					 
					
						2022-12-11 22:26:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						5f6a10ef22 
					 
					
						
						
							
							options widget work  
						
						 
						
						
						
						
					 
					
						2022-12-07 15:37:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						aec2c2d5cd 
					 
					
						
						
							
							appearance options as a special note  
						
						 
						
						
						
						
					 
					
						2022-12-05 23:57:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						b55c2d3dbc 
					 
					
						
						
							
							shortcut improvements  
						
						 
						
						
						
						
					 
					
						2022-12-01 10:03:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						6883b71ce7 
					 
					
						
						
							
							shortcut improvements  
						
						 
						
						
						
						
					 
					
						2022-11-25 15:29:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						70552d58ac 
					 
					
						
						
							
							global menu styling improvements  
						
						 
						
						
						
						
					 
					
						2022-11-25 09:21:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						c7bda4d0be 
					 
					
						
						
							
							global menu ref  
						
						 
						
						
						
						
					 
					
						2022-11-24 22:59:09 +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 
							
						 
					 
					
						
						
							
						
						b499640db8 
					 
					
						
						
							
							use trilium version number in asset paths to avoid caching issues WIP  
						
						 
						
						
						
						
					 
					
						2022-10-26 23:50:54 +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 
							
						 
					 
					
						
						
							
						
						84f72edf1d 
					 
					
						
						
							
							use button CSS variables in more places  
						
						 
						
						
						
						
					 
					
						2022-09-18 13:52:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						01a7ed8311 
					 
					
						
						
							
							fix zooming in server install  
						
						 
						
						
						
						
					 
					
						2022-09-15 23:10:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						e7ef1b86cc 
					 
					
						
						
							
							zoom buttons in main menu,  closes   #2894  
						
						 
						
						
						
						
					 
					
						2022-09-14 23:28:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DynamoFox 
							
						 
					 
					
						
						
							
						
						09641d9465 
					 
					
						
						
							
							Fix the update to latest version button in the dropdown menu, now it doesn't appear at all if update checking was disabled  
						
						 
						
						
						
						
					 
					
						2022-08-24 22:07:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						7565458332 
					 
					
						
						
							
							launchbar WIP  
						
						 
						
						
						
						
					 
					
						2022-08-04 23:00:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						d825a1a45a 
					 
					
						
						
							
							remove checkForUpdates from login screen  
						
						 
						
						
						
						
					 
					
						2022-07-20 00:11:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sigaloid 
							
						 
					 
					
						
						
							
						
						500946c10b 
					 
					
						
						
							
							Fix type  
						
						 
						
						
						
						
					 
					
						2022-07-19 16:09:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sigaloid 
							
						 
					 
					
						
						
							
						
						f3662d1048 
					 
					
						
						
							
							Add network configuration  
						
						 
						
						
						
						
					 
					
						2022-07-19 16:01:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						b678d87c80 
					 
					
						
						
							
							converted about dialog to new pattern  
						
						 
						
						
						
						
					 
					
						2022-06-12 14:03:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						0b001f41c0 
					 
					
						
						
							
							improvements/simplification to the update check  
						
						 
						
						
						
						
					 
					
						2021-11-14 21:52:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Myzel394 
							
						 
					 
					
						
						
							
						
						364ac331da 
					 
					
						
						
							
							Add update available box ( #2329 )  
						
						 
						
						... 
						
						
						
						* current stand
* added update available button
* improved update available icon
* improved update available box
* adding server side version
* added backend
* fixed text
* added option handling
* added field disabling
* removed options
* fixed terminology
* removed unnecessary imports 
						
						
					 
					
						2021-11-14 13:42:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						e378435fbe 
					 
					
						
						
							
							added "switch to mobile version" button to web edition,  closes   #1889  
						
						 
						
						
						
						
					 
					
						2021-10-31 16:56:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						113bebed3b 
					 
					
						
						
							
							switching themes via loading only specific CSS  
						
						 
						
						
						
						
					 
					
						2021-09-26 15:24:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						2fcb0c05c0 
					 
					
						
						
							
							added grey icon for the dark mode  
						
						 
						
						
						
						
					 
					
						2021-09-25 21:58:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						05d077ce28 
					 
					
						
						
							
							removed green theme  
						
						 
						
						
						
						
					 
					
						2021-07-05 17:10:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						b68bdc5005 
					 
					
						
						
							
							hide global menu tooltip upon click  
						
						 
						
						
						
						
					 
					
						2021-07-05 08:59:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						fb31acc8e0 
					 
					
						
						
							
							layout changes  
						
						 
						
						
						
						
					 
					
						2021-06-13 22:55:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						3a7da1d561 
					 
					
						
						
							
							icon and theme experiments  
						
						 
						
						
						
						
					 
					
						2021-06-06 22:15:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						6d51593b7d 
					 
					
						
						
							
							removed CSS contain from widgets  
						
						 
						
						
						
						
					 
					
						2021-06-05 22:07:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						faab6be48d 
					 
					
						
						
							
							removed zen mode  
						
						 
						
						
						
						
					 
					
						2021-06-05 21:56:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						a3d44fbdef 
					 
					
						
						
							
							button tweaks  
						
						 
						
						
						
						
					 
					
						2021-05-28 22:47:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
							
						
						5707b7e29a 
					 
					
						
						
							
							closing panes  
						
						 
						
						
						
						
					 
					
						2021-05-24 22:29:49 +02:00