zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							779751a234
							
						
					 | 
					
						
						
							
							rename "note revision" to just "revision"
						
						
						
						
						
						
					 | 
					
						2023-06-04 23:01:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e2efca933
							
						
					 | 
					
						
						
							
							scheduled erasure of attachments WIP
						
						
						
						
						
						
					 | 
					
						2023-04-21 00:19:17 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a154bea016
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next60
						
						
						
						
						
						
					 | 
					
						2023-04-11 17:02:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d6d9ab6d6
							
						
					 | 
					
						
						
							
							wip attachment support
						
						
						
						
						
						
					 | 
					
						2023-04-03 23:47:24 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b270ee87a
							
						
					 | 
					
						
						
							
							remove "hide included images" feature since with attachments it's no longer necessary
						
						
						
						
						
						
					 | 
					
						2023-03-24 09:17:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cc5859211
							
						
					 | 
					
						
						
							
							migrate images to attachments
						
						
						
						
						
						
					 | 
					
						2023-03-24 09:13:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							64d8c7a657
							
						
					 | 
					
						
						
							
							add a check for the hidden note existence, #3728
						
						
						
						
						
						
					 | 
					
						2023-03-17 22:14:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fdb23746a
							
						
					 | 
					
						
						
							
							uploading image to attachment
						
						
						
						
						
						
					 | 
					
						2023-03-16 18:34:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b84f1be00
							
						
					 | 
					
						
						
							
							unify .setContent() .getContent() handling across notes, revisions, attachments
						
						
						
						
						
						
					 | 
					
						2023-03-16 15:19:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6efc954bd
							
						
					 | 
					
						
						
							
							blob WIP
						
						
						
						
						
						
					 | 
					
						2023-03-16 12:17:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eee05a4d01
							
						
					 | 
					
						
						
							
							blob WIP
						
						
						
						
						
						
					 | 
					
						2023-03-16 12:11:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc97400dbf
							
						
					 | 
					
						
						
							
							ancillary => attachment
						
						
						
						
						
						
					 | 
					
						2023-03-16 11:03:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e16bedfab4
							
						
					 | 
					
						
						
							
							WIP blobs
						
						
						
						
						
						
					 | 
					
						2023-03-16 11:02:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a8e216dec
							
						
					 | 
					
						
						
							
							WIP blob
						
						
						
						
						
						
					 | 
					
						2023-03-15 22:44:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5225a99995
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2023-03-09 09:38:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							929f8ef720
							
						
					 | 
					
						
						
							
							note ancillary/attachment backported from dev branch
						
						
						
						
						
						
					 | 
					
						2023-03-08 09:01:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed30ec27e7
							
						
					 | 
					
						
						
							
							update demo API examples
						
						
						
						
						
						
					 | 
					
						2023-02-17 23:34:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eaab82551f
							
						
					 | 
					
						
						
							
							API migration to remove deprecated calls
						
						
						
						
						
						
					 | 
					
						2023-02-17 23:23:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f7b554cdc
							
						
					 | 
					
						
						
							
							preparing 0.59 without ocr/pdf, userguide, note ancillaries
						
						
						
						
						
						
					 | 
					
						2023-02-17 14:49:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							15607becc6
							
						
					 | 
					
						
						
							
							Merge branch 'master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/app/entities/fnote.js
#	src/services/notes.js 
						
						
					 | 
					
						2023-02-02 23:35:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e0fbea3b3
							
						
					 | 
					
						
						
							
							fix disabled: on attribtue changed script in demo document, fixes #3564
						
						
						
						
						
						
					 | 
					
						2023-02-01 07:29:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							37ba76fdd8
							
						
					 | 
					
						
						
							
							refactored note attachment into note ancillary
						
						
						
						
						
						
					 | 
					
						2023-01-28 13:13:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd8568809f
							
						
					 | 
					
						
						
							
							export/import attachments
						
						
						
						
						
						
					 | 
					
						2023-01-25 09:55:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c57f08ef7
							
						
					 | 
					
						
						
							
							added checksum to note_attachment
						
						
						
						
						
						
					 | 
					
						2023-01-24 16:55:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e9dbda077
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	package.json 
						
						
					 | 
					
						2023-01-24 09:20:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a33645360
							
						
					 | 
					
						
						
							
							migrating canvas etc.
						
						
						
						
						
						
					 | 
					
						2023-01-23 16:57:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							339d8a7378
							
						
					 | 
					
						
						
							
							initial implementation of note attachments
						
						
						
						
						
						
					 | 
					
						2023-01-22 23:36:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2a19c56b1
							
						
					 | 
					
						
						
							
							add excludeFromNoteMap to a day template instead of journal root, #3547
						
						
						
						
						
						
					 | 
					
						2023-01-21 11:13:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3149aecf4
							
						
					 | 
					
						
						
							
							fix migration for DBs which did not have _hidden tree created, closes #3536
						
						
						
						
						
						
					 | 
					
						2023-01-17 23:13:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b567775129
							
						
					 | 
					
						
						
							
							small fixes of steel blue theme
						
						
						
						
						
						
					 | 
					
						2023-01-17 21:06:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							98620887d4
							
						
					 | 
					
						
						
							
							fix demo steel blue main menu icon
						
						
						
						
						
						
					 | 
					
						2023-01-16 22:19:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a2cbcd68b
							
						
					 | 
					
						
						
							
							fix duplicate unique key in migration, #3526
						
						
						
						
						
						
					 | 
					
						2023-01-14 22:57:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7b3c3239b
							
						
					 | 
					
						
						
							
							fix migration of bookmarks to also migrate bookmarkFolder #3514
						
						
						
						
						
						
					 | 
					
						2023-01-13 08:43:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff1f01be8c
							
						
					 | 
					
						
						
							
							erase deleted notes in the migration
						
						
						
						
						
						
					 | 
					
						2022-12-28 12:58:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ddaa8f5c2
							
						
					 | 
					
						
						
							
							migration fixes
						
						
						
						
						
						
					 | 
					
						2022-12-27 21:17:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c177d2b97b
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2022-12-27 14:52:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0758c82983
							
						
					 | 
					
						
						
							
							hidden subtree is now built as "predictable" to avoid duplicating it in sync
						
						
						
						
						
						
					 | 
					
						2022-12-27 14:44:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f08fbf7bca
							
						
					 | 
					
						
						
							
							fix migration
						
						
						
						
						
						
					 | 
					
						2022-12-24 21:25:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6f7c604c7
							
						
					 | 
					
						
						
							
							fix share migration
						
						
						
						
						
						
					 | 
					
						2022-12-24 12:54:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5fb2cccd5
							
						
					 | 
					
						
						
							
							fix bookmark's ID
						
						
						
						
						
						
					 | 
					
						2022-12-24 12:26:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bff33932d9
							
						
					 | 
					
						
						
							
							fix migration to not rely on branchId
						
						
						
						
						
						
					 | 
					
						2022-12-24 07:17:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a1fb126c1
							
						
					 | 
					
						
						
							
							randomize existing fixed branchIds so it's clear they should not be relied upon
						
						
						
						
						
						
					 | 
					
						2022-12-23 20:55:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c4db266a4
							
						
					 | 
					
						
						
							
							code should not rely on fixed branch IDs since they can change after move
						
						
						
						
						
						
					 | 
					
						2022-12-23 20:40:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0441e7396a
							
						
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2022-12-23 15:07:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a882ad41c5
							
						
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2022-12-22 21:01:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e05e4bec32
							
						
					 | 
					
						
						
							
							fix old migration to avoid unique constraints problems, closes #3447
						
						
						
						
						
						
					 | 
					
						2022-12-22 15:11:20 +01:00 | 
					
					
						
						
							
							
							
						
					 |