zadam
							
						 
					 | 
					
						
						
							
						
						099e90ed64
					 | 
					
						
						
							
							fix extracting base64 inline images from HTML, fixes #1159
						
						
						
						
						
						
					 | 
					
						2020-07-26 22:58:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a574fce13f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable' into syncification
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js 
						
						
					 | 
					
						2020-06-24 22:08:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c78ca4c9db
					 | 
					
						
						
							
							fixed triggers to sort children of notes with "sorted" label, closes #1126
						
						
						
						
						
						
					 | 
					
						2020-06-23 22:03:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						027afab6b1
					 | 
					
						
						
							
							fix DB setup
						
						
						
						
						
						
					 | 
					
						2020-06-20 21:42:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						88348c560c
					 | 
					
						
						
							
							syncification
						
						
						
						
						
						
					 | 
					
						2020-06-20 12:31:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						91e5f24798
					 | 
					
						
						
							
							fix db anonymization
						
						
						
						
						
						
					 | 
					
						2020-06-02 23:13:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						75bd395669
					 | 
					
						
						
							
							fix extra refresh because of duplicated sync event, closes #1063
						
						
						
						
						
						
					 | 
					
						2020-05-30 22:35:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9d8b8e26a1
					 | 
					
						
						
							
							attach extension to download file if note present
						
						
						
						
						
						
					 | 
					
						2020-05-12 10:28:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2369bcf9fc
					 | 
					
						
						
							
							fixes for image download
						
						
						
						
						
						
					 | 
					
						2020-05-06 23:11:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b89a2df462
					 | 
					
						
						
							
							fix image being redownloaded from localhost
						
						
						
						
						
						
					 | 
					
						2020-05-04 10:03:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						227c3e4dcc
					 | 
					
						
						
							
							fixes for offline downloading of images
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:33:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						48aadc8309
					 | 
					
						
						
							
							fix parsing of includeNote, closes #963
						
						
						
						
						
						
					 | 
					
						2020-04-13 18:12:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3772d97dfa
					 | 
					
						
						
							
							basic text preview implemented
						
						
						
						
						
						
					 | 
					
						2020-04-06 22:08:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5c0355718f
					 | 
					
						
						
							
							repository has now first level cache
						
						
						
						
						
						
					 | 
					
						2020-04-06 20:59:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						081693f263
					 | 
					
						
						
							
							not generating externalLink labels anymore since there can be too many and benefit is too small
						
						
						
						
						
						
					 | 
					
						2020-04-05 16:06:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						8d312515dd
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2020-04-05 15:35:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						8d7687f354
					 | 
					
						
						
							
							fix copying template's content, closes #943
						
						
						
						
						
						
					 | 
					
						2020-04-05 12:28:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						42128c007f
					 | 
					
						
						
							
							fix "search in subtree", closes #941
						
						
						
						
						
						
					 | 
					
						2020-04-04 22:49:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3bbb213f82
					 | 
					
						
						
							
							fixes for web clipper
						
						
						
						
						
						
					 | 
					
						2020-04-02 22:55:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2e55d544f1
					 | 
					
						
						
							
							db setup fixes
						
						
						
						
						
						
					 | 
					
						2020-03-26 16:59:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f9a79fa00f
					 | 
					
						
						
							
							improvements and logging to local image storage
						
						
						
						
						
						
					 | 
					
						2020-03-25 21:01:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ef61e22f1f
					 | 
					
						
						
							
							local image storage fixes
						
						
						
						
						
						
					 | 
					
						2020-03-25 18:21:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						8a92786012
					 | 
					
						
						
							
							save paste images locally WIP
						
						
						
						
						
						
					 | 
					
						2020-03-25 11:28:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						40247a591e
					 | 
					
						
						
							
							fix delete shortcut in note tree and protect notes recursively
						
						
						
						
						
						
					 | 
					
						2020-03-15 22:09:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						7bcae9981b
					 | 
					
						
						
							
							unified/simplified protecting notes & subtree
						
						
						
						
						
						
					 | 
					
						2020-02-26 16:37:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ad7a55d305
					 | 
					
						
						
							
							always autofix note_contents.content = NULL sync issue after note erasion
						
						
						
						
						
						
					 | 
					
						2020-02-19 19:51:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						88bd65c679
					 | 
					
						
						
							
							external links are also parsed and label is created for them, closes #851
						
						
						
						
						
						
					 | 
					
						2020-02-09 10:45:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5e91b1b5e0
					 | 
					
						
						
							
							package updates
						
						
						
						
						
						
					 | 
					
						2020-01-11 09:50:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						7877443fb4
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
					 | 
					
						2020-01-11 09:41:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						759e47bfcf
					 | 
					
						
						
							
							using included note should create a relation, closes #820
						
						
						
						
						
						
					 | 
					
						2020-01-10 21:41:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4c7c3105e8
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/services/notes.js 
						
						
					 | 
					
						2020-01-07 22:29:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ccaa9eae3a
					 | 
					
						
						
							
							fix context submenus, closes #810
						
						
						
						
						
						
					 | 
					
						2020-01-07 20:53:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1cd2711097
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
					 | 
					
						2020-01-05 20:02:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ca587cccf6
					 | 
					
						
						
							
							book note type has automatically empty mime type
						
						
						
						
						
						
					 | 
					
						2020-01-04 19:34:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						54d89a9f47
					 | 
					
						
						
							
							allow configuring the time period before deleted notes are erased (and changed the default to 7 days)
						
						
						
						
						
						
					 | 
					
						2020-01-03 22:32:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						17b23d92ef
					 | 
					
						
						
							
							delete/undelete fixes
						
						
						
						
						
						
					 | 
					
						2020-01-03 13:41:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						14f3c783f2
					 | 
					
						
						
							
							undelete note WIP
						
						
						
						
						
						
					 | 
					
						2020-01-03 13:14:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c1d0a1e07b
					 | 
					
						
						
							
							undelete note WIP
						
						
						
						
						
						
					 | 
					
						2020-01-03 10:48:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						aff9ce97ee
					 | 
					
						
						
							
							small sync fixes
						
						
						
						
						
						
					 | 
					
						2019-12-16 22:00:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nil0x42
							
						 
					 | 
					
						
						
							
						
						4688cda493
					 | 
					
						
						
							
							[DOC] createNewNote(): Add missing render type (#740)
						
						
						
						
						
						
					 | 
					
						2019-12-03 19:49:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0e2f8b5734
					 | 
					
						
						
							
							don't set date modified on erasing
						
						
						
						
						
						
					 | 
					
						2019-12-03 19:10:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						dc063983ea
					 | 
					
						
						
							
							correctly respect label @disableVersioning
						
						
						
						
						
						
					 | 
					
						2019-12-02 20:21:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						29eb5a8435
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/services/notes.js
#	src/tools/generate_document.js 
						
						
					 | 
					
						2019-12-01 10:32:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5de92171a7
					 | 
					
						
						
							
							use owned attributes where it's a better fit
						
						
						
						
						
						
					 | 
					
						2019-12-01 10:28:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						29c5e394ab
					 | 
					
						
						
							
							generate document now creates also labels and relations
						
						
						
						
						
						
					 | 
					
						2019-12-01 10:20:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						67663fba50
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2019-11-30 11:36:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0415efd33b
					 | 
					
						
						
							
							create year/month/date labels/relation only when the note is created
						
						
						
						
						
						
					 | 
					
						2019-11-27 19:42:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						dbd2040bee
					 | 
					
						
						
							
							shortcut fixes
						
						
						
						
						
						
					 | 
					
						2019-11-24 22:15:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1e979d71c7
					 | 
					
						
						
							
							changed note selection in tree using keyboard - now only sibling nodes are selected
						
						
						
						
						
						
					 | 
					
						2019-11-24 22:01:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						92cb723d0c
					 | 
					
						
						
							
							updated inapp help with current shortcuts
						
						
						
						
						
						
					 | 
					
						2019-11-23 22:17:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |