zadam
							
						 
					 | 
					
						
						
							
						
						90d10c1ff3
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/tree_context_menu.js
#	src/services/import/enex.js 
						
						
					 | 
					
						2019-11-27 18:54:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						94c904fb40
					 | 
					
						
						
							
							fix context menu over root, closes #726
						
						
						
						
						
						
					 | 
					
						2019-11-26 19:42:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						6bbd4c59bc
					 | 
					
						
						
							
							reduce flicker of "create new day note"
						
						
						
						
						
						
					 | 
					
						2019-11-24 21:40:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						499c9a7381
					 | 
					
						
						
							
							separated some context menu items into "advanced"
						
						
						
						
						
						
					 | 
					
						2019-11-24 20:00:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1f37d00e42
					 | 
					
						
						
							
							updating also shortcuts in element titles
						
						
						
						
						
						
					 | 
					
						2019-11-24 10:14:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ff0245f05f
					 | 
					
						
						
							
							dynamically translating kbd based on actions
						
						
						
						
						
						
					 | 
					
						2019-11-22 22:35:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						522f71cb91
					 | 
					
						
						
							
							fix tree clipboard
						
						
						
						
						
						
					 | 
					
						2019-11-20 19:24:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						07043fb177
					 | 
					
						
						
							
							switch search in subtree to ctrl+shift+s to stay consistent with ctrl+s
						
						
						
						
						
						
					 | 
					
						2019-11-19 23:04:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1f8d382b1f
					 | 
					
						
						
							
							added "search in subtree" context menu, #534
						
						
						
						
						
						
					 | 
					
						2019-11-19 21:11:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4cda661c1b
					 | 
					
						
						
							
							add move to dialog
						
						
						
						
						
						
					 | 
					
						2019-11-11 22:57:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						77ac8df1e6
					 | 
					
						
						
							
							keyboard shortcut ctrl+shift+c for "clone to..." dialog
						
						
						
						
						
						
					 | 
					
						2019-11-10 22:19:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b53e2a3570
					 | 
					
						
						
							
							clone to notes now has overview of notes to clone and is available from context menu
						
						
						
						
						
						
					 | 
					
						2019-11-10 22:06:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						7cd75cebfc
					 | 
					
						
						
							
							fix icons in context menu
						
						
						
						
						
						
					 | 
					
						2019-11-09 13:32:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9c9ef1c7b4
					 | 
					
						
						
							
							added more careful handling of search note operations, fixes #683
						
						
						
						
						
						
					 | 
					
						2019-11-04 22:41:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						df40accdd4
					 | 
					
						
						
							
							fix bug when context menu sometimes does not show up, closes #682
						
						
						
						
						
						
					 | 
					
						2019-11-04 20:20:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b67aa99b86
					 | 
					
						
						
							
							small fixes in context menu item visibility
						
						
						
						
						
						
					 | 
					
						2019-11-04 19:37:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						d3c957768f
					 | 
					
						
						
							
							branches in tree cache should always be loaded if some branchId reference exists
						
						
						
						
						
						
					 | 
					
						2019-10-26 09:58:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b16c2d19b6
					 | 
					
						
						
							
							duplicate (single) note
						
						
						
						
						
						
					 | 
					
						2019-10-19 12:36:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						36c87b7fa0
					 | 
					
						
						
							
							renamed "messagingService" to "ws"
						
						
						
						
						
						
					 | 
					
						2019-08-26 20:21:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fab4c59f9b
					 | 
					
						
						
							
							using dynamic import for dialogs and widgets to speed up initial load
						
						
						
						
						
						
					 | 
					
						2019-08-20 21:40:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fead3cd7ad
					 | 
					
						
						
							
							fix note export/import/branch prefix to use right-clicked note as opposed to current active
						
						
						
						
						
						
					 | 
					
						2019-06-20 09:37:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c827d38f39
					 | 
					
						
						
							
							when single note is selected and it's the same that was right clicked for context menu, then we treat it as no-selection action
						
						
						
						
						
						
					 | 
					
						2019-06-17 22:25:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ee89111bfb
					 | 
					
						
						
							
							fix clipboard operation for single nodes
						
						
						
						
						
						
					 | 
					
						2019-06-16 18:07:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						288b3077b2
					 | 
					
						
						
							
							context menu items are now disabled when there are selected notes and the item does not support actions on multiple items
						
						
						
						
						
						
					 | 
					
						2019-06-16 12:06:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						943b35fb7d
					 | 
					
						
						
							
							fix delete with keyboard and context menu regarding the selection
						
						
						
						
						
						
					 | 
					
						2019-06-13 22:55:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						14c420b782
					 | 
					
						
						
							
							new tab infrastructure
						
						
						
						
						
						
					 | 
					
						2019-05-12 12:58:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2dec8f1ad6
					 | 
					
						
						
							
							hoisting note now seems to work correctly in relation to tabs
						
						
						
						
						
						
					 | 
					
						2019-05-11 21:27:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c7b5784123
					 | 
					
						
						
							
							context menu refactoring
						
						
						
						
						
						
					 | 
					
						2019-05-03 20:27:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0d11cadc18
					 | 
					
						
						
							
							tabs wip
						
						
						
						
						
						
					 | 
					
						2019-05-02 22:24:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						064a11d872
					 | 
					
						
						
							
							don't allow deleting hoisted note + other related fixes, closes #488
						
						
						
						
						
						
					 | 
					
						2019-04-16 21:40:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						71916b5e28
					 | 
					
						
						
							
							empty icon for some menu actions do de-emphasize less important items
						
						
						
						
						
						
					 | 
					
						2019-04-14 13:51:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						90a331b989
					 | 
					
						
						
							
							some style fixes and refactoring for tree context menu
						
						
						
						
						
						
					 | 
					
						2019-04-01 21:11:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						89b8e2bb08
					 | 
					
						
						
							
							redesign of search input. Saved search is now saved under active note and doesn't need page reload
						
						
						
						
						
						
					 | 
					
						2019-03-29 23:24:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fc13e1fa6a
					 | 
					
						
						
							
							added possibility to search by attached script returning note ids + some refactorings
						
						
						
						
						
						
					 | 
					
						2019-03-20 22:28:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						616829464f
					 | 
					
						
						
							
							refactoring of context menu items, got rid of ContextMenuItemsContainer
						
						
						
						
						
						
					 | 
					
						2019-03-19 22:56:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ca0d17d93a
					 | 
					
						
						
							
							cloning is now done without reloading the whole tree
						
						
						
						
						
						
					 | 
					
						2019-03-18 22:33:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						33f2aaa650
					 | 
					
						
						
							
							note type context submenu now works end to end
						
						
						
						
						
						
					 | 
					
						2019-03-17 12:19:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						177caec011
					 | 
					
						
						
							
							note type context submenu WIP
						
						
						
						
						
						
					 | 
					
						2019-03-17 11:38:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						45ddfef30a
					 | 
					
						
						
							
							new import dialog
						
						
						
						
						
						
					 | 
					
						2019-02-10 14:33:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						c85979b66b
					 | 
					
						
						
							
							it should not be possible to add note after hoisted note
						
						
						
						
						
						
					 | 
					
						2019-01-02 18:59:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						2f680c4326
					 | 
					
						
						
							
							tweaks, fixes, refactorings, creating new note from detail, not tree
						
						
						
						
						
						
					 | 
					
						2018-12-29 10:04:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						d2f72529b3
					 | 
					
						
						
							
							context menu with delete
						
						
						
						
						
						
					 | 
					
						2018-12-28 22:05:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						841420360e
					 | 
					
						
						
							
							quick unhoist link/button
						
						
						
						
						
						
					 | 
					
						2018-12-15 20:29:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						86fcbb0354
					 | 
					
						
						
							
							keyboard shortcut for hoisting, hoisted note is always expanded and has arrow icon
						
						
						
						
						
						
					 | 
					
						2018-12-12 20:54:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						6fbf28b30d
					 | 
					
						
						
							
							hoisting notes WIP
						
						
						
						
						
						
					 | 
					
						2018-12-11 21:53:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						ee23bcc783
					 | 
					
						
						
							
							unified export dialog, WIP
						
						
						
						
						
						
					 | 
					
						2018-11-24 14:44:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						4f34fb802b
					 | 
					
						
						
							
							minor icon changes
						
						
						
						
						
						
					 | 
					
						2018-11-09 20:45:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						d978c64e1a
					 | 
					
						
						
							
							refactoring of tree context menu into reusable component
						
						
						
						
						
						
					 | 
					
						2018-11-09 17:11:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						232f135843
					 | 
					
						
						
							
							using jam font icon pack instead of feather, fixes #204
						
						
						
						
						
						
					 | 
					
						2018-11-09 11:57:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								azivner
							
						 
					 | 
					
						
						
							
						
						5f427e37fe
					 | 
					
						
						
							
							export dialog to choose export format, closes #207
						
						
						
						
						
						
					 | 
					
						2018-11-07 22:58:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |