zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a254199746 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-26 21:47:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							496767a52b 
							
						 
					 
					
						
						
							
							release 0.46.6  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-25 20:28:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9139c597e5 
							
						 
					 
					
						
						
							
							use only one label for icon class,  fixes   #1791  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-25 19:46:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							942132c01d 
							
						 
					 
					
						
						
							
							release 0.46.6  
						
						 
						
						
						
						
							
  v0.46.6
 
						
					 
					
						2021-03-23 23:57:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							928c8bfdf7 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-23 22:47:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1862acd1ff 
							
						 
					 
					
						
						
							
							avoid getting refreshes on note title  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-23 22:46:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ce7e18d0b0 
							
						 
					 
					
						
						
							
							fix syncing protected notes in case there wasn't any other change,  closes   #1778  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-23 22:18:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							65280d5ba3 
							
						 
					 
					
						
						
							
							avoid ugly error in the logs,  #1778  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-22 23:27:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7e3d424e23 
							
						 
					 
					
						
						
							
							fix deleting all revisions,  closes   #1774  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-22 23:07:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f38c0f88 
							
						 
					 
					
						
						
							
							sync status style fix  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 23:45:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							56f97f1081 
							
						 
					 
					
						
						
							
							dragging the tab vertically by 100px will now move it to a new window (chrome like behavior)  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 23:35:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e648505ad3 
							
						 
					 
					
						
						
							
							avoid weird button shrinking when window size is too small,  fixes   #1745  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 23:12:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							71c3fd5cbb 
							
						 
					 
					
						
						
							
							don't use special layout for "extra window"  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 23:05:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b0418333 
							
						 
					 
					
						
						
							
							sync status widget tweaks  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 22:46:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							392a00ac17 
							
						 
					 
					
						
						
							
							sync status widget  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 22:43:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9919a866 
							
						 
					 
					
						
						
							
							sync status widget WIP  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-21 00:01:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9dd95b62a9 
							
						 
					 
					
						
						
							
							added ScrollingContainer to guarantee scrolling to top when switching notes  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-20 19:44:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							135b4fe88e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/public/app/layouts/mobile_layout.js 
						
						
							
						
					 
					
						2021-03-20 12:49:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							bff04c121a 
							
						 
					 
					
						
						
							
							fix scrolling in mobile frontend,  closes   #1768  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-20 12:47:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b79d81a94d 
							
						 
					 
					
						
						
							
							sync status widget WIP  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-20 00:00:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							7e2186721f 
							
						 
					 
					
						
						
							
							added "re-render note" menu item & shortcut,  closes   #1766  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-19 22:34:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6a70e0ab97 
							
						 
					 
					
						
						
							
							add trilium-no-cert-check bat/shell file in order to be able to connect to the sync server even without valid server certificate  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 23:49:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b38a63d336 
							
						 
					 
					
						
						
							
							delete notes dialog provides checkbox to switch between delete all clones and normal delete  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 23:42:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							d62558d97a 
							
						 
					 
					
						
						
							
							delete notes dialog WIP  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 23:23:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							76aa7d1451 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 22:11:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4f401d71a2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 21:11:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick Moriarty 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb437ff642 
							
						 
					 
					
						
						
							
							Add mobile dropdown for plugin buttons ( #1762 )  
						
						 
						
						... 
						
						
						
						* Add mobile toolbar buttons
* cleanup
* more cleanup
* Mobile plugin buttons: Add else block & change icon 
						
						
							
						
					 
					
						2021-03-18 21:09:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6edc6e2825 
							
						 
					 
					
						
						
							
							load search result only on explicit action (expand node, execute search),  #1759  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 21:05:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							e8903e82a1 
							
						 
					 
					
						
						
							
							add option to disable note tree auto collapse,  fixes   #1751  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-18 20:11:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							59e8cb8c8b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-17 23:20:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0cfd95d9b8 
							
						 
					 
					
						
						
							
							not finding node for a note path does not have to be always an error  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-17 23:17:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa5349628 
							
						 
					 
					
						
						
							
							make edit button visible for empty readonly notes,  fixes   #1760  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-17 22:41:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick Moriarty 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a4bffbfa60 
							
						 
					 
					
						
						
							
							Mobile view: iOS sizing/styling changes ( #1756 )  
						
						 
						
						... 
						
						
						
						* Fix dark themed action-button text color on mobile safari
* Fix note view scrolling on ios safari
* Fix scroll issues on tree view on ios safari
* Fix mobile firefox/chrome sizing issues
* Fix scroll-to-active-note 
						
						
							
						
					 
					
						2021-03-17 22:07:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							70656d240b 
							
						 
					 
					
						
						
							
							better-sqlite3 built for electron 12 windows  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-15 23:49:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							42067b3c1e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-15 23:40:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							0bc91da0bb 
							
						 
					 
					
						
						
							
							added possibility to zoom into images using mousewheel  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-15 22:24:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4e21d12202 
							
						 
					 
					
						
						
							
							fix nodejs 10 compatibility,  closes   #1746  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-15 20:31:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							fdce218e88 
							
						 
					 
					
						
						
							
							release 0.46.5  
						
						 
						
						
						
						
							
  v0.46.5
 
						
					 
					
						2021-03-14 22:56:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5b72b577b8 
							
						 
					 
					
						
						
							
							delete notes preview dialog WIP  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-14 22:54:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							ec2f8ec796 
							
						 
					 
					
						
						
							
							added subtree note count into info widget  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-14 20:47:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							cd3f8a41af 
							
						 
					 
					
						
						
							
							removed (112) migrations originating before first public release (0.20 in Sept 2018)  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-14 20:37:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							aa8bf0e60a 
							
						 
					 
					
						
						
							
							Revert "Revert "delete notes skeleton dialog""  
						
						 
						
						... 
						
						
						
						This reverts commit 584fea19 
						
						
							
						
					 
					
						2021-03-14 19:54:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							5b3a6b5e9d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-14 19:53:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8d20288d 
							
						 
					 
					
						
						
							
							fix 0.46 regression to set up sync from client,  fixes   #1742  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-13 22:54:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							88d04772c4 
							
						 
					 
					
						
						
							
							make sure the CLS entity changes are cleared after roll backed transaction,  #1736  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-12 23:48:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							9fd26a9b9f 
							
						 
					 
					
						
						
							
							when creating new note into inbox use current hoisted note in new tab as well  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-12 21:47:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							98f02c3c9a 
							
						 
					 
					
						
						
							
							added "hoistedInbox" label  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-12 21:29:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							584fea1992 
							
						 
					 
					
						
						
							
							Revert "delete notes skeleton dialog"  
						
						 
						
						... 
						
						
						
						This reverts commit 03a11e6f 
						
						
							
						
					 
					
						2021-03-12 20:44:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							af50a1ec52 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/stable' into stable  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-12 20:39:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							4e76d1fa85 
							
						 
					 
					
						
						
							
							hide some "boring" attributes from book listing view  
						
						 
						
						
						
						
							
						
					 
					
						2021-03-12 20:39:42 +01:00