zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4933b901f6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
					 | 
					
						2022-01-14 21:53:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c102089731
							
						
					 | 
					
						
						
							
							migration workaround for corrupted index in entity_changes table, closes #2534
						
						
						
						
						
						
					 | 
					
						2022-01-14 19:44:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4325db207
							
						
					 | 
					
						
						
							
							revised demo document
						
						
						
						
						
						
					 | 
					
						2022-01-13 20:02:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							48d93cb3da
							
						
					 | 
					
						
						
							
							added custom resource handler to the demo document
						
						
						
						
						
						
					 | 
					
						2022-01-12 21:24:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2248d98cc7
							
						
					 | 
					
						
						
							
							using 201 for created entities in etapi
						
						
						
						
						
						
					 | 
					
						2022-01-12 21:14:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							28df5d4aa2
							
						
					 | 
					
						
						
							
							etapi improvements and more tests
						
						
						
						
						
						
					 | 
					
						2022-01-12 19:32:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							42e85aefdc
							
						
					 | 
					
						
						
							
							sync fixes
						
						
						
						
						
						
					 | 
					
						2022-01-10 21:24:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							91dec23d5e
							
						
					 | 
					
						
						
							
							ETAPI auth, spec improvements etc.
						
						
						
						
						
						
					 | 
					
						2022-01-10 17:09:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d2641dbd7
							
						
					 | 
					
						
						
							
							sync fixes
						
						
						
						
						
						
					 | 
					
						2022-01-09 21:25:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							96f4230bc1
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next50
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js 
						
						
					 | 
					
						2022-01-09 20:18:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1995b54770
							
						
					 | 
					
						
						
							
							fix migration to preserve IDs in entity_changes
						
						
						
						
						
						
					 | 
					
						2022-01-09 20:17:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7159b13c9d
							
						
					 | 
					
						
						
							
							add memberId to entity_changes to avoid having to resend all changes second time
						
						
						
						
						
						
					 | 
					
						2022-01-09 20:16:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9df521109b
							
						
					 | 
					
						
						
							
							fix migration to handle duplicates in entity_changes, #2534
						
						
						
						
						
						
					 | 
					
						2022-01-08 22:43:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							75b65c396e
							
						
					 | 
					
						
						
							
							fix migration to handle duplicates in entity_changes, #2534
						
						
						
						
						
						
					 | 
					
						2022-01-08 22:31:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee1c9f3da
							
						
					 | 
					
						
						
							
							ETAPI delete/patch, refactoring
						
						
						
						
						
						
					 | 
					
						2022-01-07 19:33:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6f3cc7988
							
						
					 | 
					
						
						
							
							fix migration from 0.47, closes #2514
						
						
						
						
						
						
					 | 
					
						2022-01-05 20:21:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f92016f9ec
							
						
					 | 
					
						
						
							
							set password from web trilium
						
						
						
						
						
						
					 | 
					
						2021-12-29 23:37:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc9903191e
							
						
					 | 
					
						
						
							
							fix migration script
						
						
						
						
						
						
					 | 
					
						2021-12-22 13:14:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7faebfac3
							
						
					 | 
					
						
						
							
							sharing WIP
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:12:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							42b5437c87
							
						
					 | 
					
						
						
							
							fix setup new document, closes #2368
						
						
						
						
						
						
					 | 
					
						2021-11-21 13:44:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e36bc42519
							
						
					 | 
					
						
						
							
							added changeId into entity_changes to have cross-sync change ID
						
						
						
						
						
						
					 | 
					
						2021-11-18 22:33:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							15ac81627c
							
						
					 | 
					
						
						
							
							DB cleanup migration
						
						
						
						
						
						
					 | 
					
						2021-11-18 21:52:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba676587df
							
						
					 | 
					
						
						
							
							fix importing notePosition of directories
						
						
						
						
						
						
					 | 
					
						2021-10-08 22:31:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a08690b123
							
						
					 | 
					
						
						
							
							CKEditor 30 content styles
						
						
						
						
						
						
					 | 
					
						2021-10-08 18:17:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							79f54b4e97
							
						
					 | 
					
						
						
							
							inactive tab background tweaks
						
						
						
						
						
						
					 | 
					
						2021-10-08 18:09:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa40a5f496
							
						
					 | 
					
						
						
							
							fixed demo document + added bookmarks
						
						
						
						
						
						
					 | 
					
						2021-10-08 15:48:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1ca538106
							
						
					 | 
					
						
						
							
							excludeFromTreeMap generalized to excludeFromNoteMap
						
						
						
						
						
						
					 | 
					
						2021-10-03 11:04:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							831de3ffed
							
						
					 | 
					
						
						
							
							fix mermaid diagram size
						
						
						
						
						
						
					 | 
					
						2021-09-30 13:48:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							291b434d70
							
						
					 | 
					
						
						
							
							added mermaid samples to demo document
						
						
						
						
						
						
					 | 
					
						2021-09-30 13:17:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0264e847ef
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2021-09-28 10:58:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5917bfc78
							
						
					 | 
					
						
						
							
							fix "steel blue" demo theme
						
						
						
						
						
						
					 | 
					
						2021-09-28 10:02:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							113bebed3b
							
						
					 | 
					
						
						
							
							switching themes via loading only specific CSS
						
						
						
						
						
						
					 | 
					
						2021-09-26 15:24:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fcb0c05c0
							
						
					 | 
					
						
						
							
							added grey icon for the dark mode
						
						
						
						
						
						
					 | 
					
						2021-09-25 21:58:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2baa9bdb3
							
						
					 | 
					
						
						
							
							excludeFromTreeMap in demo document
						
						
						
						
						
						
					 | 
					
						2021-09-23 22:54:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd00f6bd97
							
						
					 | 
					
						
						
							
							removed older migrations since they don't work anyway (after becca refactoring)
						
						
						
						
						
						
					 | 
					
						2021-09-23 22:09:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b041d081db
							
						
					 | 
					
						
						
							
							added migration to add excludeFromTreeMap for journal subtrees
						
						
						
						
						
						
					 | 
					
						2021-09-23 22:08:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b381331029
							
						
					 | 
					
						
						
							
							refactoring of date notes route
						
						
						
						
						
						
					 | 
					
						2021-07-24 11:28:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a1287a3de
							
						
					 | 
					
						
						
							
							fixes in the demo document
						
						
						
						
						
						
					 | 
					
						2021-07-23 14:53:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0351d7eff1
							
						
					 | 
					
						
						
							
							keyboard shortcuts for ribbon tabs
						
						
						
						
						
						
					 | 
					
						2021-06-27 12:53:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e1c9782ff
							
						
					 | 
					
						
						
							
							use MontserratLight also for setup
						
						
						
						
						
						
					 | 
					
						2021-06-26 23:20:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2148f4a18
							
						
					 | 
					
						
						
							
							updated demo document with adjusted steel blue theme
						
						
						
						
						
						
					 | 
					
						2021-06-26 23:10:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2bfd7b844c
							
						
					 | 
					
						
						
							
							refactoring of pane => split, "pane" keeps its old meaning (left-pane, center-pane, right-pane)
						
						
						
						
						
						
					 | 
					
						2021-06-03 22:23:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ed816f1b2
							
						
					 | 
					
						
						
							
							dark theme tweaks
						
						
						
						
						
						
					 | 
					
						2021-06-02 21:39:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1302765478
							
						
					 | 
					
						
						
							
							added sidebar toggle button
						
						
						
						
						
						
					 | 
					
						2021-05-22 21:35:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							274cf7312c
							
						
					 | 
					
						
						
							
							refactored TabContext => NoteContext
						
						
						
						
						
						
					 | 
					
						2021-05-22 12:26:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9645a07f2f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable' into next
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json 
						
						
					 | 
					
						2021-05-15 22:45:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2030c8e995
							
						
					 | 
					
						
						
							
							fallback value for isErased for 0173 migration, #1937
						
						
						
						
						
						
					 | 
					
						2021-05-14 21:52:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e257634ccf
							
						
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 22:47:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d8d654fe8
							
						
					 | 
					
						
						
							
							becca entities enriched with functionality from repository entities
						
						
						
						
						
						
					 | 
					
						2021-04-25 20:00:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							926e9e12c0
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json 
						
						
					 | 
					
						2021-04-05 11:44:42 +02:00 | 
					
					
						
						
							
							
							
						
					 |