zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4039ea5e1
							
						
					 | 
					
						
						
							
							fixed printing relation map
						
						
						
						
						
						
					 | 
					
						2020-03-08 09:24:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							95fef8d2e5
							
						
					 | 
					
						
						
							
							fixes after merge
						
						
						
						
						
						
					 | 
					
						2020-03-07 22:29:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7105b61aab
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/javascripts/desktop.js
#	src/views/desktop.ejs
#	src/views/mobile.ejs 
						
						
					 | 
					
						2020-03-07 22:21:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							78a50be663
							
						
					 | 
					
						
						
							
							don't print control buttons
						
						
						
						
						
						
					 | 
					
						2020-03-07 22:18:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d3ad3b99b
							
						
					 | 
					
						
						
							
							include themes.css for printing to have default CSS variables available
						
						
						
						
						
						
					 | 
					
						2020-03-07 22:14:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d9cdcac85
							
						
					 | 
					
						
						
							
							load appropriate styles for printing book notes, closes #899
						
						
						
						
						
						
					 | 
					
						2020-03-07 22:01:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4f7bb37db
							
						
					 | 
					
						
						
							
							removed sidebar widget settings
						
						
						
						
						
						
					 | 
					
						2020-03-07 21:34:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							81ec85083a
							
						
					 | 
					
						
						
							
							link map widget always rendered centered map
						
						
						
						
						
						
					 | 
					
						2020-03-07 20:41:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							62da383623
							
						
					 | 
					
						
						
							
							only one update
						
						
						
						
						
						
					 | 
					
						2020-03-07 15:01:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8513e0201c
							
						
					 | 
					
						
						
							
							collapsed state is now synchronized across tab-cached instances
						
						
						
						
						
						
					 | 
					
						2020-03-07 14:31:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							abd60581be
							
						
					 | 
					
						
						
							
							right pane is now scrollable
						
						
						
						
						
						
					 | 
					
						2020-03-07 14:18:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							aff02184f8
							
						
					 | 
					
						
						
							
							removed last tab should activate second to last
						
						
						
						
						
						
					 | 
					
						2020-03-07 13:57:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8909d175d0
							
						
					 | 
					
						
						
							
							event fixes
						
						
						
						
						
						
					 | 
					
						2020-03-07 13:40:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							091eb8f791
							
						
					 | 
					
						
						
							
							event fixes WIP
						
						
						
						
						
						
					 | 
					
						2020-03-06 23:34:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e10d23289e
							
						
					 | 
					
						
						
							
							event fixes WIP
						
						
						
						
						
						
					 | 
					
						2020-03-06 22:17:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							26599f057c
							
						
					 | 
					
						
						
							
							collapsible widget remember their collapsed state
						
						
						
						
						
						
					 | 
					
						2020-03-01 20:49:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e0e2e8926
							
						
					 | 
					
						
						
							
							fixes in side pane toggling
						
						
						
						
						
						
					 | 
					
						2020-03-01 20:11:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c631e4398
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into m41
						
						
						
						
						
						
						
						# Conflicts:
#	.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
#	src/public/stylesheets/desktop.css 
						
						
					 | 
					
						2020-03-01 19:20:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							687539cc95
							
						
					 | 
					
						
						
							
							fix zen mode
						
						
						
						
						
						
					 | 
					
						2020-03-01 19:16:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							03e0c98066
							
						
					 | 
					
						
						
							
							migrated desktop CSS to the desktop layout
						
						
						
						
						
						
					 | 
					
						2020-03-01 19:06:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							77f358b846
							
						
					 | 
					
						
						
							
							migrated mobile CSS to the mobile layout
						
						
						
						
						
						
					 | 
					
						2020-03-01 18:57:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c82e882e0
							
						
					 | 
					
						
						
							
							bit better right pane layout
						
						
						
						
						
						
					 | 
					
						2020-03-01 18:47:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f4ba43463
							
						
					 | 
					
						
						
							
							mobile frontend is working again
						
						
						
						
						
						
					 | 
					
						2020-03-01 15:19:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f15239c006
							
						
					 | 
					
						
						
							
							mobile layout fixes
						
						
						
						
						
						
					 | 
					
						2020-03-01 12:50:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed1b5e3843
							
						
					 | 
					
						
						
							
							mobile layout fixes
						
						
						
						
						
						
					 | 
					
						2020-03-01 12:05:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							607bdfef92
							
						
					 | 
					
						
						
							
							mobile global buttons
						
						
						
						
						
						
					 | 
					
						2020-03-01 11:53:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f744564f2
							
						
					 | 
					
						
						
							
							start of mobile layout
						
						
						
						
						
						
					 | 
					
						2020-03-01 11:04:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f64b343d8d
							
						
					 | 
					
						
						
							
							ref
						
						
						
						
						
						
					 | 
					
						2020-03-01 10:41:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							47b803920b
							
						
					 | 
					
						
						
							
							keep body hidden until rendered
						
						
						
						
						
						
					 | 
					
						2020-02-29 22:13:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8888d04878
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2020-02-29 22:04:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							49398f5374
							
						
					 | 
					
						
						
							
							refactoring of component event system + little docs
						
						
						
						
						
						
					 | 
					
						2020-02-29 19:43:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							95d1952896
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2020-02-29 16:26:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ab2b41e8c
							
						
					 | 
					
						
						
							
							open links in new tab without activation
						
						
						
						
						
						
					 | 
					
						2020-02-29 15:00:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5155130e7
							
						
					 | 
					
						
						
							
							ckeditor with table/cell properties
						
						
						
						
						
						
					 | 
					
						2020-02-29 14:32:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							724ba352e6
							
						
					 | 
					
						
						
							
							refactored existing context menus
						
						
						
						
						
						
					 | 
					
						2020-02-29 13:03:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1239293435
							
						
					 | 
					
						
						
							
							spell check context menu
						
						
						
						
						
						
					 | 
					
						2020-02-29 11:28:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							16f42dd4ab
							
						
					 | 
					
						
						
							
							use electron 8 spellchecker instead of electron-spellchecker, WIP
						
						
						
						
						
						
					 | 
					
						2020-02-28 22:07:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							350331e2ef
							
						
					 | 
					
						
						
							
							fix 500px constant height of relation maps, closes #882
						
						
						
						
						
						
					 | 
					
						2020-02-28 15:20:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2d6a5c3e9
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2020-02-28 11:46:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb35284d37
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2020-02-28 00:31:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2af37640d8
							
						
					 | 
					
						
						
							
							small refactoring of search code
						
						
						
						
						
						
					 | 
					
						2020-02-28 00:11:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4bd298a55b
							
						
					 | 
					
						
						
							
							refactor data-kb-command
						
						
						
						
						
						
					 | 
					
						2020-02-27 23:12:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd4b1235a7
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:35:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e3c85f891
							
						
					 | 
					
						
						
							
							fix issues
						
						
						
						
						
						
					 | 
					
						2020-02-27 12:41:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2a3e1cc04
							
						
					 | 
					
						
						
							
							fixed double refresh of note detail
						
						
						
						
						
						
					 | 
					
						2020-02-27 12:26:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d71763aedb
							
						
					 | 
					
						
						
							
							title row spacing
						
						
						
						
						
						
					 | 
					
						2020-02-27 10:08:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							368d0c55da
							
						
					 | 
					
						
						
							
							refactoring of layout finished
						
						
						
						
						
						
					 | 
					
						2020-02-27 10:03:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							637010577b
							
						
					 | 
					
						
						
							
							layout changes WIP
						
						
						
						
						
						
					 | 
					
						2020-02-27 00:58:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bcae9981b
							
						
					 | 
					
						
						
							
							unified/simplified protecting notes & subtree
						
						
						
						
						
						
					 | 
					
						2020-02-26 16:37:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3752cf8cba
							
						
					 | 
					
						
						
							
							layout fixes
						
						
						
						
						
						
					 | 
					
						2020-02-25 19:19:10 +01:00 | 
					
					
						
						
							
							
							
						
					 |