zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b32d86f78
							
						
					 | 
					
						
						
							
							take branch prefix into account while sorting, fixes #3896
						
						
						
						
						
						
					 | 
					
						2023-05-03 23:42:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5ea8226996
							
						
					 | 
					
						
						
							
							Merge pull request #3777 from PhilippOesch/#3689
						
						
						
						
						
						
						
						change downdown border to light border 
						
						
					 | 
					
						2023-05-03 23:25:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbffc6b2b5
							
						
					 | 
					
						
						
							
							inline attachment images into single HTML export
						
						
						
						
						
						
					 | 
					
						2023-05-03 23:17:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd01886eb2
							
						
					 | 
					
						
						
							
							attachment revision upload
						
						
						
						
						
						
					 | 
					
						2023-05-03 22:49:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								contributor
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb8fd2b054
							
						
					 | 
					
						
						
							
							zip export - set note title as document.title
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:19:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8bc9c2982
							
						
					 | 
					
						
						
							
							attachment actions
						
						
						
						
						
						
					 | 
					
						2023-05-03 10:23:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d232694dec
							
						
					 | 
					
						
						
							
							tree context menu to convert notes into attachments
						
						
						
						
						
						
					 | 
					
						2023-05-02 23:04:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							735ac55bb8
							
						
					 | 
					
						
						
							
							fixes, allowing conversion of note into an attachment
						
						
						
						
						
						
					 | 
					
						2023-05-02 22:46:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kara
							
						 
					 | 
					
						
						
						
						
							
						
						
							53c87f3d25
							
						
					 | 
					
						
						
							
							Return created/existing branch in EnsureNoteIsPresentInParent
						
						
						
						
						
						
					 | 
					
						2023-05-01 12:41:22 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4f1fafdf75
							
						
					 | 
					
						
						
							
							Merge pull request #3870 from soulsands/perf-count
						
						
						
						
						
						
						
						perf: improve descendant count performance 
						
						
					 | 
					
						2023-04-28 21:53:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							330e7ac08e
							
						
					 | 
					
						
						
							
							copying attachments WIP
						
						
						
						
						
						
					 | 
					
						2023-04-25 00:01:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							49fb913eab
							
						
					 | 
					
						
						
							
							erasing unused attachments
						
						
						
						
						
						
					 | 
					
						2023-04-24 21:22:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b074365e7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next60
						
						
						
						
						
						
					 | 
					
						2023-04-24 20:21:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0896000fcd
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
					 | 
					
						2023-04-24 20:21:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Castor
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e007aba067
							
						
					 | 
					
						
						
							
							Update note_map.js
						
						
						
						
						
						
					 | 
					
						2023-04-24 13:43:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eff567ee48
							
						
					 | 
					
						
						
							
							wrong password login screen should return 401 so that it counts to the rate limiter, fixes #3867
						
						
						
						
						
						
					 | 
					
						2023-04-23 22:22:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								baiyongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							89681977b5
							
						
					 | 
					
						
						
							
							perf: improve descendant count performance
						
						
						
						
						
						
					 | 
					
						2023-04-23 15:36:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soulsands
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3c6d73bb2
							
						
					 | 
					
						
						
							
							fix:  match custom path strictly
						
						
						
						
						
						
					 | 
					
						2023-04-22 19:37:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e2efca933
							
						
					 | 
					
						
						
							
							scheduled erasure of attachments WIP
						
						
						
						
						
						
					 | 
					
						2023-04-21 00:19:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e71b0d82a1
							
						
					 | 
					
						
						
							
							scheduled attachment deletion WIP
						
						
						
						
						
						
					 | 
					
						2023-04-20 00:11:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6c162cdda
							
						
					 | 
					
						
						
							
							restore revision with attachments
						
						
						
						
						
						
					 | 
					
						2023-04-19 22:47:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b46d6c718
							
						
					 | 
					
						
						
							
							Merge branch 'stable' into next60
						
						
						
						
						
						
					 | 
					
						2023-04-19 22:03:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e24d5a6f83
							
						
					 | 
					
						
						
							
							collapse command will collapse the whole tree, including the current active note path, fixes #3664
						
						
						
						
						
						
					 | 
					
						2023-04-19 21:24:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e28fbf4617
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-17 23:21:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e4a040ed8
							
						
					 | 
					
						
						
							
							fixes of new attachment URLs
						
						
						
						
						
						
					 | 
					
						2023-04-17 22:40:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b84670d503
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next60
						
						
						
						
						
						
					 | 
					
						2023-04-17 22:27:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8725f7cfb2
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/services/build.js 
						
						
					 | 
					
						2023-04-17 22:26:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							83d8908ee8
							
						
					 | 
					
						
						
							
							release 0.59.4
						
						
						
						
						
						
					 | 
					
						2023-04-17 21:40:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3eafdadd1f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into eslint-format
						
						
						
						
						
						
					 | 
					
						2023-04-17 20:44:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d3272e9f8
							
						
					 | 
					
						
						
							
							fix displaying error message in mermaid, closes #3841
						
						
						
						
						
						
					 | 
					
						2023-04-16 23:41:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							447b8f0f0c
							
						
					 | 
					
						
						
							
							Merge pull request #3848 from soulsands/auto-reload
						
						
						
						
						
						
						
						chore: dev auto reload 
						
						
					 | 
					
						2023-04-16 23:30:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							44c61b8e7d
							
						
					 | 
					
						
						
							
							Merge pull request #3846 from soulsands/highlighter
						
						
						
						
						
						
						
						change match-hightlighter config 
						
						
					 | 
					
						2023-04-16 23:27:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8226f62ded
							
						
					 | 
					
						
						
							
							download offline images from libreoffice, fixes #3842
						
						
						
						
						
						
					 | 
					
						2023-04-16 23:11:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d3b17f586d
							
						
					 | 
					
						
						
							
							Merge pull request #3839 from soulsands/activate
						
						
						
						
						
						
						
						Activating after removal of subContexts conforms to mainContexts 
						
						
					 | 
					
						2023-04-16 22:11:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9a22c3fce7
							
						
					 | 
					
						
						
							
							Merge pull request #3837 from soulsands/fix-tree
						
						
						
						
						
						
						
						fix: correct moving active node 
						
						
					 | 
					
						2023-04-16 20:50:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							63e044ffdf
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-04-16 11:28:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e794ee38f
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-16 09:26:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1d4e062ed
							
						
					 | 
					
						
						
							
							refactoring of "some path" WIP
						
						
						
						
						
						
					 | 
					
						2023-04-16 09:22:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Castor
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d2d2a28885
							
						
					 | 
					
						
						
							
							Update ws.js
						
						
						
						
						
						
					 | 
					
						2023-04-15 19:42:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								baiyongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ead4242735
							
						
					 | 
					
						
						
							
							chore: dev auto reload
						
						
						
						
						
						
					 | 
					
						2023-04-15 17:58:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								baiyongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							25df8f9c52
							
						
					 | 
					
						
						
							
							change match-hightlighter config
						
						
						
						
						
						
					 | 
					
						2023-04-15 11:01:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								baiyongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							65d2389b2e
							
						
					 | 
					
						
						
							
							update eslint config & fix lint
						
						
						
						
						
						
					 | 
					
						2023-04-15 09:57:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7aa26580ba
							
						
					 | 
					
						
						
							
							refactoring of "some path" WIP
						
						
						
						
						
						
					 | 
					
						2023-04-15 00:06:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4376bb9f2
							
						
					 | 
					
						
						
							
							isRoot check
						
						
						
						
						
						
					 | 
					
						2023-04-14 20:24:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f01657e1dd
							
						
					 | 
					
						
						
							
							refactorings
						
						
						
						
						
						
					 | 
					
						2023-04-14 16:49:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soulsands
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c08126752
							
						
					 | 
					
						
						
							
							activating after removal of subContexts  conforms to mainContexts
						
						
						
						
						
						
					 | 
					
						2023-04-13 21:16:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								baiyongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad8ec68443
							
						
					 | 
					
						
						
							
							fix: correct active tree node after moving an clone node
						
						
						
						
						
						
					 | 
					
						2023-04-13 11:05:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							34ecd77bd4
							
						
					 | 
					
						
						
							
							note revision save also saves attachments
						
						
						
						
						
						
					 | 
					
						2023-04-11 23:24:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6cf0fe0b73
							
						
					 | 
					
						
						
							
							attachments have a position
						
						
						
						
						
						
					 | 
					
						2023-04-11 22:55:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f8bf7cacc
							
						
					 | 
					
						
						
							
							renamed openTabs to openNoteContexts
						
						
						
						
						
						
					 | 
					
						2023-04-11 22:00:04 +02:00 | 
					
					
						
						
							
							
							
						
					 |