zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ca3e9a0bc
							
						
					 | 
					
						
						
							
							fixed db migrations after merge from stable
						
						
						
						
						
						
					 | 
					
						2020-08-02 20:44:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4a4e746bf
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
#	package.json
#	src/routes/api/login.js
#	src/routes/api/sync.js
#	src/routes/index.js
#	src/services/app_info.js
#	src/services/sync.js 
						
						
					 | 
					
						2020-08-02 20:41:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3582013a33
							
						
					 | 
					
						
						
							
							import of initial demo document sets sync.isSynced incorrectly to always 0, #1163
						
						
						
						
						
						
					 | 
					
						2020-07-31 00:07:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							df69b1d8dd
							
						
					 | 
					
						
						
							
							attr detail handles label/relation definition updates
						
						
						
						
						
						
					 | 
					
						2020-07-18 23:45:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							18749092ff
							
						
					 | 
					
						
						
							
							sql_init/migration fixes
						
						
						
						
						
						
					 | 
					
						2020-07-02 22:57:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e18e7dc67
							
						
					 | 
					
						
						
							
							html sanitize imported notes, #1137
						
						
						
						
						
						
					 | 
					
						2020-06-30 23:37:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							22302e8200
							
						
					 | 
					
						
						
							
							attrs WIP
						
						
						
						
						
						
					 | 
					
						2020-06-21 23:41:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5e27278ab
							
						
					 | 
					
						
						
							
							fix migration script to preserve sync IDs
						
						
						
						
						
						
					 | 
					
						2020-03-15 11:19:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							73bf2dcb02
							
						
					 | 
					
						
						
							
							added isSynced to sync table to allow forward compatibility with 0.41
						
						
						
						
						
						
					 | 
					
						2020-03-09 20:56:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1690248e24
							
						
					 | 
					
						
						
							
							migration script to fix contentLength = -1 in new notes
						
						
						
						
						
						
					 | 
					
						2020-01-19 09:08:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1d0a1e07b
							
						
					 | 
					
						
						
							
							undelete note WIP
						
						
						
						
						
						
					 | 
					
						2020-01-03 10:48:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ef2e7769f
							
						
					 | 
					
						
						
							
							added index to source_ids
						
						
						
						
						
						
					 | 
					
						2019-12-01 14:39:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d57caee0d3
							
						
					 | 
					
						
						
							
							drop unnecessary indexes
						
						
						
						
						
						
					 | 
					
						2019-12-01 12:38:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff3f0ee0a0
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
					 | 
					
						2019-11-23 23:07:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4bec265c1
							
						
					 | 
					
						
						
							
							system links (internal, image, relation map) should follow camelCase convention used for other attributes
						
						
						
						
						
						
					 | 
					
						2019-11-23 20:54:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8ba07a4ae
							
						
					 | 
					
						
						
							
							fix migration script in case of not fully consistent database (missing note_contents for note). closes #717
						
						
						
						
						
						
					 | 
					
						2019-11-23 11:13:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c49c69f824
							
						
					 | 
					
						
						
							
							fix migration script
						
						
						
						
						
						
					 | 
					
						2019-11-12 21:32:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bd1d8feb4
							
						
					 | 
					
						
						
							
							fix setting isErased after note migration
						
						
						
						
						
						
					 | 
					
						2019-11-11 23:37:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ba7e74b58
							
						
					 | 
					
						
						
							
							fix note revision's isErased initial value after migration
						
						
						
						
						
						
					 | 
					
						2019-11-11 23:26:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b24ae0600
							
						
					 | 
					
						
						
							
							erasing note revisions
						
						
						
						
						
						
					 | 
					
						2019-11-09 15:21:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c7beb5502
							
						
					 | 
					
						
						
							
							added contentLength to note entity
						
						
						
						
						
						
					 | 
					
						2019-11-09 09:36:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							894c888d87
							
						
					 | 
					
						
						
							
							including ckeditor mentions plugin for easy linking
						
						
						
						
						
						
					 | 
					
						2019-11-06 22:58:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2af86927b0
							
						
					 | 
					
						
						
							
							added flag for the erased notes
						
						
						
						
						
						
					 | 
					
						2019-11-01 22:09:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e58e32112
							
						
					 | 
					
						
						
							
							note revision sync and other fixes
						
						
						
						
						
						
					 | 
					
						2019-11-01 20:00:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e5e3e4675
							
						
					 | 
					
						
						
							
							note revisions changes WIP
						
						
						
						
						
						
					 | 
					
						2019-11-01 19:21:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf53cbf1dd
							
						
					 | 
					
						
						
							
							moving out note revision content into separate table, refactoring, WIP
						
						
						
						
						
						
					 | 
					
						2019-10-31 21:58:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b16c2d19b6
							
						
					 | 
					
						
						
							
							duplicate (single) note
						
						
						
						
						
						
					 | 
					
						2019-10-19 12:36:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							157bd3816d
							
						
					 | 
					
						
						
							
							add hideTabRowForOneTab if missing, fixes #660
						
						
						
						
						
						
					 | 
					
						2019-10-18 21:04:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1e8a4b384
							
						
					 | 
					
						
						
							
							spell check support + small options tabs reorganization
						
						
						
						
						
						
					 | 
					
						2019-10-06 21:35:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3f2b71803
							
						
					 | 
					
						
						
							
							calendar widget setup
						
						
						
						
						
						
					 | 
					
						2019-09-08 13:08:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b069436039
							
						
					 | 
					
						
						
							
							added "edited notes on date" widget
						
						
						
						
						
						
					 | 
					
						2019-09-07 10:11:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d80df398b
							
						
					 | 
					
						
						
							
							removed event log
						
						
						
						
						
						
					 | 
					
						2019-09-02 20:30:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8a5c71ec2
							
						
					 | 
					
						
						
							
							tweaks to similar notes + missing options init
						
						
						
						
						
						
					 | 
					
						2019-09-01 11:37:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c60080772
							
						
					 | 
					
						
						
							
							basic implementation of "similar notes" widget
						
						
						
						
						
						
					 | 
					
						2019-09-01 08:58:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f59ea547
							
						
					 | 
					
						
						
							
							options UI for selecting support code note MIME types
						
						
						
						
						
						
					 | 
					
						2019-08-29 21:08:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9abea83f3
							
						
					 | 
					
						
						
							
							refactoring of access to options in frontend
						
						
						
						
						
						
					 | 
					
						2019-08-22 23:31:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ab2c924c4
							
						
					 | 
					
						
						
							
							widget ordering WIP
						
						
						
						
						
						
					 | 
					
						2019-08-22 20:58:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b9415a619
							
						
					 | 
					
						
						
							
							widget config WIP
						
						
						
						
						
						
					 | 
					
						2019-08-21 23:16:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b818f020a7
							
						
					 | 
					
						
						
							
							option to configure if sidebar should be enabled in new tab
						
						
						
						
						
						
					 | 
					
						2019-08-19 23:29:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9888850c22
							
						
					 | 
					
						
						
							
							resizing sidebar in options
						
						
						
						
						
						
					 | 
					
						2019-08-19 23:02:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cb421143f
							
						
					 | 
					
						
						
							
							Link entity migrated to Attribute, WIP
						
						
						
						
						
						
					 | 
					
						2019-08-19 20:12:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							29828f8e8f
							
						
					 | 
					
						
						
							
							fix recent notes (db & sync version increase)
						
						
						
						
						
						
					 | 
					
						2019-05-21 21:47:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd1fc23fe8
							
						
					 | 
					
						
						
							
							work on hash & history
						
						
						
						
						
						
					 | 
					
						2019-05-14 22:29:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fab8b77794
							
						
					 | 
					
						
						
							
							configurable hiding of tab row for one tab
						
						
						
						
						
						
					 | 
					
						2019-05-12 21:45:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							be68391c37
							
						
					 | 
					
						
						
							
							store "openTabs" session
						
						
						
						
						
						
					 | 
					
						2019-05-10 21:43:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1990c9399e
							
						
					 | 
					
						
						
							
							removed FTS5 completely
						
						
						
						
						
						
					 | 
					
						2019-04-21 12:03:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e374e795b
							
						
					 | 
					
						
						
							
							fill sync rows to fix sync issues
						
						
						
						
						
						
					 | 
					
						2019-04-13 10:30:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							67553cb40e
							
						
					 | 
					
						
						
							
							fix ordering of note migrations
						
						
						
						
						
						
					 | 
					
						2019-03-30 22:20:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cafbda7cd
							
						
					 | 
					
						
						
							
							migration for inconsistent isProtected status across notes and note_contents
						
						
						
						
						
						
					 | 
					
						2019-03-30 22:12:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a5a085103
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/server.js
#	src/services/app_info.js
#	src/services/notes.js 
						
						
					 | 
					
						2019-03-30 22:11:03 +01:00 | 
					
					
						
						
							
							
							
						
					 |