zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f1f632a7d
							
						
					 | 
					
						
						
							
							fix activating notes in the hidden subtree
						
						
						
						
						
						
					 | 
					
						2022-10-16 23:11:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e83d3a54d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into next57
						
						
						
						
						
						
					 | 
					
						2022-10-16 21:25:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c11cf41f30
							
						
					 | 
					
						
						
							
							don't create app icon for flatpak/debian linux builds, fixes #3201
						
						
						
						
						
						
					 | 
					
						2022-10-16 20:52:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d30d5d689
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into next57
						
						
						
						
						
						
					 | 
					
						2022-10-16 11:24:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e22af42cd0
							
						
					 | 
					
						
						
							
							release 0.56.0-beta
						
						
						
						
						
						
					 | 
					
						2022-10-15 12:49:56 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9c22fcbc8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-10-15 12:03:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4012ec7498
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/app/widgets/attribute_widgets/attribute_detail.js 
						
						
					 | 
					
						2022-10-15 12:03:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DaiYuANg
							
						 
					 | 
					
						
						
						
						
							
						
						
							36842f4a58
							
						
					 | 
					
						
						
							
							update pwa manifest support deploy in sub folder
						
						
						
						
						
						
					 | 
					
						2022-10-15 13:01:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4116fe0a20
							
						
					 | 
					
						
						
							
							fix propagation of noteTypeMimeChanged event to global scope to fix e.g. edit button switching depending on note type
						
						
						
						
						
						
					 | 
					
						2022-10-14 20:36:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4e99662cb
							
						
					 | 
					
						
						
							
							edit button should get refreshed based on type change
						
						
						
						
						
						
					 | 
					
						2022-10-13 23:52:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6d4eb486e
							
						
					 | 
					
						
						
							
							fix toc with > 10 items on the same level, closes #3182
						
						
						
						
						
						
					 | 
					
						2022-10-09 22:20:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2308b7a5d
							
						
					 | 
					
						
						
							
							fix comment
						
						
						
						
						
						
					 | 
					
						2022-10-09 21:34:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e07c08043
							
						
					 | 
					
						
						
							
							basic auth etapi should require "etapi" username
						
						
						
						
						
						
					 | 
					
						2022-10-09 21:33:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a3c50d9fb
							
						
					 | 
					
						
						
							
							extra null relation checks in notemap
						
						
						
						
						
						
					 | 
					
						2022-10-08 22:24:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e4a9f63fa
							
						
					 | 
					
						
						
							
							support basic auth in ETAPI
						
						
						
						
						
						
					 | 
					
						2022-10-08 20:59:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d4ef4ee3d
							
						
					 | 
					
						
						
							
							improved error handling of wrong port configuration, #3177
						
						
						
						
						
						
					 | 
					
						2022-10-01 15:32:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d26fd6bf0
							
						
					 | 
					
						
						
							
							added "note color"
						
						
						
						
						
						
					 | 
					
						2022-09-25 14:19:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9c0daa51a
							
						
					 | 
					
						
						
							
							FIXME comment on virtual branches
						
						
						
						
						
						
					 | 
					
						2022-09-24 23:03:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d905f7cc26
							
						
					 | 
					
						
						
							
							include icon into reference links
						
						
						
						
						
						
					 | 
					
						2022-09-24 22:38:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f78937543
							
						
					 | 
					
						
						
							
							keyboardShortcut attr detail help
						
						
						
						
						
						
					 | 
					
						2022-09-23 22:51:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							41dac2bd1b
							
						
					 | 
					
						
						
							
							keyboardShortcut attr detail help
						
						
						
						
						
						
					 | 
					
						2022-09-23 22:50:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							85bf2a5706
							
						
					 | 
					
						
						
							
							fix hidden backlinks, closes #3158
						
						
						
						
						
						
					 | 
					
						2022-09-22 23:29:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce7937a3a3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-09-22 22:53:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bb9d33245
							
						
					 | 
					
						
						
							
							0 offset of context menu, fixes #3157
						
						
						
						
						
						
					 | 
					
						2022-09-22 22:53:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Dagenais
							
						 
					 | 
					
						
						
						
						
							
						
						
							73ad557784
							
						
					 | 
					
						
						
							
							improve "open" button behaviour for files when in browser
						
						
						
						
						
						
					 | 
					
						2022-09-21 21:56:59 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c196ae3a5
							
						
					 | 
					
						
						
							
							fix deleting / erasing note
						
						
						
						
						
						
					 | 
					
						2022-09-21 23:58:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							15ed381f85
							
						
					 | 
					
						
						
							
							release 0.55.1
						
						
						
						
						
						
					 | 
					
						2022-09-21 22:43:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							180051d252
							
						
					 | 
					
						
						
							
							added "scrolling-container" class, fixes #3147
						
						
						
						
						
						
					 | 
					
						2022-09-19 23:15:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a19c58703f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-09-19 23:12:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc43d9222a
							
						
					 | 
					
						
						
							
							fix erasing notes - becca should be reloaded afterwards, closes #3146
						
						
						
						
						
						
					 | 
					
						2022-09-19 23:12:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							af6bf08243
							
						
					 | 
					
						
						
							
							Merge pull request #3143 from charlesdagenais/master
						
						
						
						
						
						
						
						add file properties widget in mobile layout 
						
						
					 | 
					
						2022-09-19 22:44:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Dagenais
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f61c1b3b6
							
						
					 | 
					
						
						
							
							add file properties info in mobile view
						
						
						
						
						
						
					 | 
					
						2022-09-18 12:40:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sylvain Pasche
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc69f3b8f3
							
						
					 | 
					
						
						
							
							let import continue when malformed URLs are encountered
						
						
						
						
						
						
						
						In case of malformed URLs in imported HTML, keep original URL instead
of having the import get stuck. 
						
						
					 | 
					
						2022-09-18 18:18:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4658b9c2a
							
						
					 | 
					
						
						
							
							bring back the possibility to close the floating buttons again, closes #3116
						
						
						
						
						
						
					 | 
					
						2022-09-18 14:57:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							84f72edf1d
							
						
					 | 
					
						
						
							
							use button CSS variables in more places
						
						
						
						
						
						
					 | 
					
						2022-09-18 13:52:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							47235965d5
							
						
					 | 
					
						
						
							
							api log close button
						
						
						
						
						
						
					 | 
					
						2022-09-18 08:48:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							24e4455e91
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-09-17 23:06:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea35b0c800
							
						
					 | 
					
						
						
							
							Merge branch 'api-log-capture'
						
						
						
						
						
						
					 | 
					
						2022-09-17 23:06:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a30087426
							
						
					 | 
					
						
						
							
							api log implementation
						
						
						
						
						
						
					 | 
					
						2022-09-17 23:06:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jph
							
						 
					 | 
					
						
						
						
						
							
						
						
							513d1c020c
							
						
					 | 
					
						
						
							
							Add another ETAPI method to the api spec file.
						
						
						
						
						
						
					 | 
					
						2022-09-17 10:47:44 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							05231bd1c2
							
						
					 | 
					
						
						
							
							stop #workspaceTemplate from being inherited (should have the same special behavior as #template)
						
						
						
						
						
						
					 | 
					
						2022-09-16 23:03:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b816773d02
							
						
					 | 
					
						
						
							
							add #workspaceTemplate which works as workspace-scoped template, closes #3137
						
						
						
						
						
						
					 | 
					
						2022-09-16 22:44:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c49ea6cb1
							
						
					 | 
					
						
						
							
							make context sub-menu scrollable, fix #3136
						
						
						
						
						
						
					 | 
					
						2022-09-16 22:12:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Hynes
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a6ead6d86
							
						
					 | 
					
						
						
							
							fix a couple of api shortcomings
						
						
						
						
						
						
						
						* add note content to openapi spec file
* add test for get note content api endpoint 
						
						
					 | 
					
						2022-09-16 13:18:01 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							01a7ed8311
							
						
					 | 
					
						
						
							
							fix zooming in server install
						
						
						
						
						
						
					 | 
					
						2022-09-15 23:10:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf6330dee6
							
						
					 | 
					
						
						
							
							allow deleting notes from note actions button, closes #3131
						
						
						
						
						
						
					 | 
					
						2022-09-15 23:09:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7ef1b86cc
							
						
					 | 
					
						
						
							
							zoom buttons in main menu, closes #2894
						
						
						
						
						
						
					 | 
					
						2022-09-14 23:28:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3663d56917
							
						
					 | 
					
						
						
							
							api log capture WIP
						
						
						
						
						
						
					 | 
					
						2022-09-14 16:50:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							135064a18f
							
						
					 | 
					
						
						
							
							drag & drop from tree will insert links to notes, closes #227
						
						
						
						
						
						
					 | 
					
						2022-09-13 23:36:59 +02:00 | 
					
					
						
						
							
							
							
						
					 |