zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f17be0ef9b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-22 22:38:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0b2951ff6
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-22 22:30:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f3d73b9fd
							
						
					 | 
					
						
						
							
							release 0.45.7
						
						
						
						
						
						
							
 v0.45.7
						
					 | 
					
						2020-12-22 20:21:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dde78e98a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 23:19:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdfd760b9d
							
						
					 | 
					
						
						
							
							fixed some encryption issues
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 23:19:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c0662ab82
							
						
					 | 
					
						
						
							
							fix displaying protected notes outside of protected session
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 23:10:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc3addebd4
							
						
					 | 
					
						
						
							
							date notes respect their parent's isProtected status, #1483
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 23:00:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7133e60267
							
						
					 | 
					
						
						
							
							make encryption more robust in face of null values, #1483
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 22:08:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc4edf4aa7
							
						
					 | 
					
						
						
							
							better comment for instanceName
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 21:05:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eaf93a70cd
							
						
					 | 
					
						
						
							
							fix inverse relation creation, closes #1498
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-21 20:55:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1b2e22ba5
							
						
					 | 
					
						
						
							
							add possibility to add whole iso date as date pattern, #1496
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-20 22:49:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8936f3bc8
							
						
					 | 
					
						
						
							
							use trilium.sid as a session ID to avoid session ID conflicts
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-20 22:20:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steven Tang
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							015c9d2ccd
							
						
					 | 
					
						
						
							
							rename session cookie from connect.sid to trilium (#1495)
						
						
						
						
						
						
						
						to prevent collisions with other express-session apps 
						
						
							
						
					 | 
					
						2020-12-20 22:18:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							95ccfd2521
							
						
					 | 
					
						
						
							
							use bootstrap default monospace fonts for code notes, fixes #1489
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-18 22:37:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c15d299e0
							
						
					 | 
					
						
						
							
							isErased fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-18 22:35:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b093569ec5
							
						
					 | 
					
						
						
							
							increase toast size limit
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-18 21:23:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8089ba370
							
						
					 | 
					
						
						
							
							fixed saved search refresh
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-17 21:19:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							053162fef2
							
						
					 | 
					
						
						
							
							bootstrap 4.5.3
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-17 15:20:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							71bbf2eb16
							
						
					 | 
					
						
						
							
							close note type dropdown after click
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-17 15:19:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f723433970
							
						
					 | 
					
						
						
							
							fix deleting notes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-17 15:04:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cc7917b6e
							
						
					 | 
					
						
						
							
							renamed remnants of "sync" to "entity_change"
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-16 22:17:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdc2721ac1
							
						
					 | 
					
						
						
							
							DB migration fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-16 20:58:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a15127e58
							
						
					 | 
					
						
						
							
							removal of isErased from old entities
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-16 15:05:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5ec57e08e
							
						
					 | 
					
						
						
							
							cleanup of isErased obsolete usage
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-16 15:01:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0578971f7
							
						
					 | 
					
						
						
							
							fix manual erasing note revisions
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-16 14:36:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b0bb22273
							
						
					 | 
					
						
						
							
							drop isDeleted index
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-15 15:30:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf653a9a5c
							
						
					 | 
					
						
						
							
							ckeditor 24 content styles
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-15 15:18:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5467dc62cd
							
						
					 | 
					
						
						
							
							extra case sensitivity tests
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-15 15:15:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							96eff4c410
							
						
					 | 
					
						
						
							
							fixed search tests
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-15 15:09:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a12181a57
							
						
					 | 
					
						
						
							
							search fixes WIP
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 23:59:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fccce2ff1e
							
						
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 23:04:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c949dcb449
							
						
					 | 
					
						
						
							
							fixes and optimizations
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 22:12:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b99f065d5
							
						
					 | 
					
						
						
							
							fixes of recent entity changes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 14:17:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d7b9e0db3
							
						
					 | 
					
						
						
							
							erasing rows of deleted entities
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 13:58:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							248fa780e8
							
						
					 | 
					
						
						
							
							erasing rows of deleted entities
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 13:47:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							20c7c657da
							
						
					 | 
					
						
						
							
							moving isErased into entity_changes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-14 13:15:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a896cc19c
							
						
					 | 
					
						
						
							
							tree fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-13 23:27:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bb548d0d1
							
						
					 | 
					
						
						
							
							ckeditor 24
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-13 20:27:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							de1584eab8
							
						
					 | 
					
						
						
							
							note list improvements
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-13 20:13:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							60e2026850
							
						
					 | 
					
						
						
							
							improved note list pager for many pages
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-12 12:07:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5098dda376
							
						
					 | 
					
						
						
							
							load initial tree from note cache
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-11 22:06:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							35e47f866a
							
						
					 | 
					
						
						
							
							fix root branch
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-11 15:27:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							199d89c1a6
							
						
					 | 
					
						
						
							
							optimizations and fixes
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-11 15:24:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							be543737a9
							
						
					 | 
					
						
						
							
							sorting search results occurences in the note title
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-11 13:54:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b6fa4ab06
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/optimize-tree'
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-10 22:54:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f1b2fa226
							
						
					 | 
					
						
						
							
							move entity hash to entity_changes table
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-10 22:53:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5010175b84
							
						
					 | 
					
						
						
							
							adding few missing isErased = 0 conditions
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-10 21:56:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ac42608f7
							
						
					 | 
					
						
						
							
							faster tree loading of many notes at once #1480
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-10 21:27:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4633c68a0c
							
						
					 | 
					
						
						
							
							avoid resorting children on every child add, fixes #1480
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-10 16:10:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							33571e0ef3
							
						
					 | 
					
						
						
							
							better logging for un/protect errors
						
						
						
						
						
						
							
						
					 | 
					
						2020-12-09 22:49:55 +01:00 | 
					
					
						
						
							
							
							
						
					 |