zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7d9870846
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/better-sqlite3'
						
						
						
						
						
						
						
						# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/services/utils.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/utils.js 
						
						
							
						
					 | 
					
						2020-06-18 09:03:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f745e21e0d
							
						
					 | 
					
						
						
							
							use better-sqlite3
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-17 23:03:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f2361ebd5
							
						
					 | 
					
						
						
							
							release 0.43.0-beta
						
						
						
						
						
						
							
 v0.43.0-beta
						
					 | 
					
						2020-06-15 23:26:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9791dab97d
							
						
					 | 
					
						
						
							
							recent changes sorting fixes, closes #1099
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-15 23:22:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							85d986534d
							
						
					 | 
					
						
						
							
							fix enforcing node's http requests for sync
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-15 18:24:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							00faf758e8
							
						
					 | 
					
						
						
							
							fixes and polish
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-15 17:56:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ba2e5cf73
							
						
					 | 
					
						
						
							
							add word count widget to the demo document (plus cleanup of external links)
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-14 16:29:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb3876d28b
							
						
					 | 
					
						
						
							
							promoted attr selection using autocomplete will trigger change event to save it, closes #699
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-14 16:04:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb975849b9
							
						
					 | 
					
						
						
							
							small API additions
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-14 14:30:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							16fef78344
							
						
					 | 
					
						
						
							
							add API method to force refresh of included notes, closes #1106
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-14 10:50:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0b4b369dc
							
						
					 | 
					
						
						
							
							transaction handling fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-14 00:35:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0df7851214
							
						
					 | 
					
						
						
							
							fix sync
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-13 22:34:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d47c2b23e
							
						
					 | 
					
						
						
							
							opening transactions only on write operations which enforces exclusive lock only there to improve concurrency, custom handling of sync request timeouts, #1093, #1018
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-13 10:23:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d09b021487
							
						
					 | 
					
						
						
							
							add time limit to frontend update
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-11 00:13:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							910bda860c
							
						
					 | 
					
						
						
							
							fix delete note function just work one time, closes #1101
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-10 23:43:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d92b4931a
							
						
					 | 
					
						
						
							
							fix ctrl+click opening the link twice/thrice, closes #1094
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-10 00:10:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							212b719ee9
							
						
					 | 
					
						
						
							
							better detection of changes in attributes and how they affect notes
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-09 22:59:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1db892d22f
							
						
					 | 
					
						
						
							
							return the ability to hide archived notes, closes #1095
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-08 23:15:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							535dcb6d12
							
						
					 | 
					
						
						
							
							release 0.42.7
						
						
						
						
						
						
							
 v0.42.7
						
					 | 
					
						2020-06-08 10:43:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4426362799
							
						
					 | 
					
						
						
							
							cleanup sqlite to make the distributed archives smaller
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-08 10:42:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c609e8136
							
						
					 | 
					
						
						
							
							promoted attributes widget is now auto-updating, fixes #700
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-08 00:29:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							11b73b79ed
							
						
					 | 
					
						
						
							
							refresh promoted attributes when change detected
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-07 23:57:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							28dc6b93ca
							
						
					 | 
					
						
						
							
							lock CPU info for perf context
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-07 23:56:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e70c862e72
							
						
					 | 
					
						
						
							
							fix import
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-07 23:55:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3e66d5a83
							
						
					 | 
					
						
						
							
							fixed command line anonymization
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-07 10:45:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8cd821e57
							
						
					 | 
					
						
						
							
							futrther improvements to anonymization
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-07 10:20:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							401a3f0ecb
							
						
					 | 
					
						
						
							
							add info on read only notes, #1088
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-06 18:46:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e73dffad0b
							
						
					 | 
					
						
						
							
							parse incomplete attrs
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-06 12:56:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef1d062745
							
						
					 | 
					
						
						
							
							attribute parser preserves indexes from original string
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-06 10:39:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f245d51746
							
						
					 | 
					
						
						
							
							basic saving of attributes in the widget
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-05 17:25:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							be7ac74235
							
						
					 | 
					
						
						
							
							better fallback for resolving filenames of binary attachments
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-05 10:40:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad48b59893
							
						
					 | 
					
						
						
							
							no need to reload whole subtree while moving notes
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-05 00:07:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e817acba4e
							
						
					 | 
					
						
						
							
							fix template attribute cycle in note cache
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-04 23:58:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ae965c5cb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/app/widgets/collapsible_widgets/note_info.js 
						
						
							
						
					 | 
					
						2020-06-04 22:37:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							58fa0832f6
							
						
					 | 
					
						
						
							
							fix focusing title after creating a note
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-04 21:44:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1502b9ce66
							
						
					 | 
					
						
						
							
							prevent attribute inheritance cycle via template, closes #1077
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-04 12:27:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed9fbae65d
							
						
					 | 
					
						
						
							
							attribute parser and tests WIP
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-04 00:04:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							01a7af965c
							
						
					 | 
					
						
						
							
							refactoring of es6 test skeleton
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 17:28:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							99120be46d
							
						
					 | 
					
						
						
							
							skeleton of first tests
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 17:11:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							915b1d1a45
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/widgets/type_widgets/editable_text.js 
						
						
							
						
					 | 
					
						2020-06-03 16:25:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e68aed2057
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 16:24:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eedeaca37d
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 16:24:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7307ca385f
							
						
					 | 
					
						
						
							
							release 0.42.6
						
						
						
						
						
						
							
 v0.42.6
						
					 | 
					
						2020-06-03 14:30:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1fd9825aa
							
						
					 | 
					
						
						
							
							fix backup
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 12:16:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9de7d3fc53
							
						
					 | 
					
						
						
							
							fix unloading protected session after clicking on a button, closes #1078
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 11:47:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c5db844ba
							
						
					 | 
					
						
						
							
							fix tree focusing issues
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 11:06:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7330c1104
							
						
					 | 
					
						
						
							
							more anonymization
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-03 09:55:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec4586b164
							
						
					 | 
					
						
						
							
							fix reference link implementation, closes #1069
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-02 23:54:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							91e5f24798
							
						
					 | 
					
						
						
							
							fix db anonymization
						
						
						
						
						
						
							
						
					 | 
					
						2020-06-02 23:13:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							38723e0189
							
						
					 | 
					
						
						
							
							release 0.42.5
						
						
						
						
						
						
							
 v0.42.5
						
					 | 
					
						2020-05-31 23:33:30 +02:00 | 
					
					
						
						
							
							
							
						
					 |