zadam
							
						 
					 | 
					
						
						
							
						
						f01657e1dd
					 | 
					
						
						
							
							refactorings
						
						
						
						
						
						
					 | 
					
						2023-04-14 16:49:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						15a11daf38
					 | 
					
						
						
							
							Merge branch 'master' into next60
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json 
						
						
					 | 
					
						2023-04-10 18:52:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2bc78ccafb
					 | 
					
						
						
							
							wip attachment widget
						
						
						
						
						
						
					 | 
					
						2023-04-01 23:55:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fa406d3ded
					 | 
					
						
						
							
							wip attachment widget
						
						
						
						
						
						
					 | 
					
						2023-03-30 23:48:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nriver
							
						 
					 | 
					
						
						
							
						
						93ad83d2ae
					 | 
					
						
						
							
							add #sortLocale label for natural sort. rephrase feature description.
						
						
						
						
						
						
					 | 
					
						2023-03-30 11:06:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9be524ef89
					 | 
					
						
						
							
							attachment improvements
						
						
						
						
						
						
					 | 
					
						2023-03-24 10:57:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						d83005fe4d
					 | 
					
						
						
							
							improved saving attachment
						
						
						
						
						
						
					 | 
					
						2023-03-16 16:37:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b6efc954bd
					 | 
					
						
						
							
							blob WIP
						
						
						
						
						
						
					 | 
					
						2023-03-16 12:17:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						dc97400dbf
					 | 
					
						
						
							
							ancillary => attachment
						
						
						
						
						
						
					 | 
					
						2023-03-16 11:03:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nriver
							
						 
					 | 
					
						
						
							
						
						d3ec9f022c
					 | 
					
						
						
							
							add natural sort for notes, introduce new label #sortNatural
						
						
						
						
						
						
					 | 
					
						2023-03-10 14:35:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						929f8ef720
					 | 
					
						
						
							
							note ancillary/attachment backported from dev branch
						
						
						
						
						
						
					 | 
					
						2023-03-08 09:01:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						6f7b554cdc
					 | 
					
						
						
							
							preparing 0.59 without ocr/pdf, userguide, note ancillaries
						
						
						
						
						
						
					 | 
					
						2023-02-17 14:49:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						520ffecd36
					 | 
					
						
						
							
							ancillary type widget
						
						
						
						
						
						
					 | 
					
						2023-02-15 14:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						37ba76fdd8
					 | 
					
						
						
							
							refactored note attachment into note ancillary
						
						
						
						
						
						
					 | 
					
						2023-01-28 13:13:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0bfb2631df
					 | 
					
						
						
							
							fix saving mermaid attachment
						
						
						
						
						
						
					 | 
					
						2023-01-24 23:09:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c474e65cae
					 | 
					
						
						
							
							saving attachments when editing
						
						
						
						
						
						
					 | 
					
						2023-01-24 09:19:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5a2907b670
					 | 
					
						
						
							
							delete preview takes into account strong/weak branches
						
						
						
						
						
						
					 | 
					
						2022-12-24 13:15:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1b24276a4a
					 | 
					
						
						
							
							always use template strings instead of string concatenation
						
						
						
						
						
						
					 | 
					
						2022-12-21 15:19:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						dfb462cf35
					 | 
					
						
						
							
							introduced new exception classes for structured error reporting
						
						
						
						
						
						
					 | 
					
						2022-12-09 16:13:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						342ae6e5e2
					 | 
					
						
						
							
							introduced new exception classes for structured error reporting
						
						
						
						
						
						
					 | 
					
						2022-12-09 16:04:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						60fc621cd4
					 | 
					
						
						
							
							add keyboard action to force creating note revisions, #2147
						
						
						
						
						
						
					 | 
					
						2022-11-08 22:36:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						14fb9c76b0
					 | 
					
						
						
							
							fix backlinks in day note subtree, fixes #3158
						
						
						
						
						
						
					 | 
					
						2022-10-22 15:01:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sigaloid
							
						 
					 | 
					
						
						
							
						
						c85ec957ec
					 | 
					
						
						
							
							Filter excludeFromNoteMap from backlinks
						
						
						
						
						
						
					 | 
					
						2022-08-18 23:12:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						ddb57e35f3
					 | 
					
						
						
							
							Fix relation map crash on missing inverse pair (fixes #3055)
						
						
						
						
						
						
					 | 
					
						2022-08-14 04:30:00 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						869c910801
					 | 
					
						
						
							
							fix "bulk actions" dialog title
						
						
						
						
						
						
					 | 
					
						2022-08-03 19:17:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4cec856e21
					 | 
					
						
						
							
							simplified updating note content
						
						
						
						
						
						
					 | 
					
						2022-06-13 22:38:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c0c38a4b49
					 | 
					
						
						
							
							Merge branch 'master' into next53
						
						
						
						
						
						
					 | 
					
						2022-06-02 22:32:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3cfca27b54
					 | 
					
						
						
							
							expose ability to create note revisions in backend API #2890
						
						
						
						
						
						
					 | 
					
						2022-06-02 17:25:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f19adf3ee0
					 | 
					
						
						
							
							add the ability to sort notes by folders first, closes #2649
						
						
						
						
						
						
					 | 
					
						2022-05-30 20:50:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3b58b83f8b
					 | 
					
						
						
							
							improved logging
						
						
						
						
						
						
					 | 
					
						2022-04-19 23:36:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						643a5e5b16
					 | 
					
						
						
							
							moving deleteNote and deleteBranch into entities to make them accessible to scripts, #2792
						
						
						
						
						
						
					 | 
					
						2022-04-19 23:06:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a21c49cba7
					 | 
					
						
						
							
							added "hideRelations" label to relation map
						
						
						
						
						
						
					 | 
					
						2022-02-05 13:02:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9ee1c9f3da
					 | 
					
						
						
							
							ETAPI delete/patch, refactoring
						
						
						
						
						
						
					 | 
					
						2022-01-07 19:33:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a232035d47
					 | 
					
						
						
							
							fix backlink count
						
						
						
						
						
						
					 | 
					
						2021-12-24 21:01:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3860028a9e
					 | 
					
						
						
							
							sharing WIP
						
						
						
						
						
						
					 | 
					
						2021-12-20 17:30:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						034aaa7209
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/app/dialogs/options/other.js 
						
						
					 | 
					
						2021-12-14 21:54:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						97f7fe7b18
					 | 
					
						
						
							
							set note type/mime in PUT body to avoid http proxy slash reencoding, fixes #2419
						
						
						
						
						
						
					 | 
					
						2021-12-08 22:36:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a810c08c02
					 | 
					
						
						
							
							trigger note revisioning saving also on title changes #2426
						
						
						
						
						
						
					 | 
					
						2021-12-08 21:04:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0448883782
					 | 
					
						
						
							
							option to erase notes immediately
						
						
						
						
						
						
					 | 
					
						2021-09-16 14:38:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5cfd1c030d
					 | 
					
						
						
							
							allow specifiyng sorted attribute (including off for overriding), #2142
						
						
						
						
						
						
					 | 
					
						2021-09-03 22:33:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b660238a40
					 | 
					
						
						
							
							backend import unification
						
						
						
						
						
						
					 | 
					
						2021-06-29 22:15:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ac04be4433
					 | 
					
						
						
							
							mobile frontend fixes
						
						
						
						
						
						
					 | 
					
						2021-06-03 21:47:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2451596e8c
					 | 
					
						
						
							
							converting note properties to methods
						
						
						
						
						
						
					 | 
					
						2021-05-17 22:35:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						439ef4a8cb
					 | 
					
						
						
							
							moved becca to top level source dir
						
						
						
						
						
						
					 | 
					
						2021-05-17 22:09:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						8bd3e17a3b
					 | 
					
						
						
							
							removed legacy entities and repository
						
						
						
						
						
						
					 | 
					
						2021-05-17 22:05:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ef0941479c
					 | 
					
						
						
							
							fix undelete
						
						
						
						
						
						
					 | 
					
						2021-05-09 11:12:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						273d4e0052
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 19:59:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1af10d48a2
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 11:23:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						93cae44ba0
					 | 
					
						
						
							
							subtree duplication with becca
						
						
						
						
						
						
					 | 
					
						2021-04-25 22:02:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ccac46527c
					 | 
					
						
						
							
							opened file change detection now useable on all note types
						
						
						
						
						
						
					 | 
					
						2021-04-24 21:56:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |