zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							48765cc87d
							
						
					 | 
					
						
						
							
							optimize initial render
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-22 22:45:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2f6191229
							
						
					 | 
					
						
						
							
							upgrades
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-22 20:48:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							19126b7c6d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next58
						
						
						
						
						
						
						
						# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js 
						
						
							
						
					 | 
					
						2022-11-22 20:46:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a76bef1a28
							
						
					 | 
					
						
						
							
							docker should use webpacked frontend files, fixes #3322
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-21 21:15:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a259bd8c3a
							
						
					 | 
					
						
						
							
							release 0.57.1-beta
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 23:43:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4001953fd7
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 23:43:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a6df54832
							
						
					 | 
					
						
						
							
							release 0.57.1-beta
						
						
						
						
						
						
							
 v0.57.1-beta
						
					 | 
					
						2022-11-20 23:43:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							29327bbc5d
							
						
					 | 
					
						
						
							
							Merge pull request #3333 from DynamoFox/rate-limit-other-auth-routes
						
						
						
						
						
						
						
						Rate limit some more ETAPI auth routes; loginRateLimiter now doesn't count successful auth to ETAPI routes 
						
						
							
						
					 | 
					
						2022-11-20 23:35:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcb3a707f4
							
						
					 | 
					
						
						
							
							option tabs refactored
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 23:20:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a67af4f46
							
						
					 | 
					
						
						
							
							refactoring option templates to use "options-section" class
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 20:33:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3c0b36ba6
							
						
					 | 
					
						
						
							
							refactor imageoptions to use updateOption()
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 20:11:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3783b0113
							
						
					 | 
					
						
						
							
							options dialog refactoring into more standard widget structure
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-20 18:29:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DynamoFox
							
						 
					 | 
					
						
						
						
						
							
						
						
							059dca905c
							
						
					 | 
					
						
						
							
							Rate limit some more ETAPI auth routes; loginRateLimiter now doesn't count successful auth to ETAPI routes
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-19 18:45:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							02d908df1e
							
						
					 | 
					
						
						
							
							added option to disable tray, closes #2612
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-18 21:47:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a95e459eb
							
						
					 | 
					
						
						
							
							moved options to new tabs Images/Spellcheck
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-18 21:38:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae0c5a0c09
							
						
					 | 
					
						
						
							
							moved auto read only options to code/text tabs
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-18 21:27:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f238f5f1a
							
						
					 | 
					
						
						
							
							create "disableTray" option
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-18 21:08:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6cec8bcda8
							
						
					 | 
					
						
						
							
							"erase" button to the right
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-17 23:14:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d388b4d814
							
						
					 | 
					
						
						
							
							add "erase all deleted notes now" also to recent changes
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-17 23:12:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9dac00a01
							
						
					 | 
					
						
						
							
							add TRILIUM_NO_UPLOAD_LIMIT to disable the upload limit, #3164
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-17 22:54:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4961d9bb89
							
						
					 | 
					
						
						
							
							avoid errors on dead backlinks, #3289
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-14 21:03:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							89e319c7a2
							
						
					 | 
					
						
						
							
							fix backlink generation for drag & dropped links, fixes #3314
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-14 20:30:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7e56cbffe
							
						
					 | 
					
						
						
							
							release 0.57.0-beta
						
						
						
						
						
						
							
 v0.57.0-beta
						
					 | 
					
						2022-11-12 20:40:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f115a7657
							
						
					 | 
					
						
						
							
							api docs
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-12 20:40:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fad8a1ce9
							
						
					 | 
					
						
						
							
							enabled advanced list features, fixes #3308
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-10 23:22:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b242a905b
							
						
					 | 
					
						
						
							
							use CMD/meta key for opening link in a new tab on mac, #3303
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-10 23:16:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6e766f5c6
							
						
					 | 
					
						
						
							
							added a context menu for image to copy, #1954
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-09 23:41:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							055bd77bd6
							
						
					 | 
					
						
						
							
							Remove "Content of this note cannot be displayed" in the book format, fixes #3301
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 23:06:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							76f34e3eaf
							
						
					 | 
					
						
						
							
							small tweaks of linewrap option
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 22:55:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							acf3f5013c
							
						
					 | 
					
						
						
							
							Merge pull request #3299 from Banbury/code-options-linebreak
						
						
						
						
						
						
						
						Added option to toggle line wrapping for Code notes 
						
						
							
						
					 | 
					
						2022-11-08 22:49:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f6edefad4
							
						
					 | 
					
						
						
							
							note about using password to login to web, #3297
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 22:42:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							60fc621cd4
							
						
					 | 
					
						
						
							
							add keyboard action to force creating note revisions, #2147
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 22:36:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf4776a33c
							
						
					 | 
					
						
						
							
							note hoisting should be done on "hovered", not active note, closes #2124
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 22:19:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							81a59f48e6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 21:28:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							68eb04741d
							
						
					 | 
					
						
						
							
							remove console.log
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 21:27:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Banbury
							
						 
					 | 
					
						
						
						
						
							
						
						
							1037d814ec
							
						
					 | 
					
						
						
							
							Added option to toggle line wrapping for Code notes
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 14:48:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e201f3536a
							
						
					 | 
					
						
						
							
							fix jsdoc for createNoteLink
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-08 10:11:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cb368c4de
							
						
					 | 
					
						
						
							
							search link map will display only direct results
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-07 23:56:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							df9f6ce33a
							
						
					 | 
					
						
						
							
							link map improvements
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-07 23:19:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3c87156c2
							
						
					 | 
					
						
						
							
							library upgrades
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-07 21:26:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d29a633529
							
						
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-07 21:11:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c92b451033
							
						
					 | 
					
						
						
							
							cleanup of hidden notes
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-06 15:18:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3122d0cc6b
							
						
					 | 
					
						
						
							
							move share root to hidden subtree
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-06 14:44:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1eaa20e47
							
						
					 | 
					
						
						
							
							note map fixes
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-06 14:38:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d8b02055e
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-06 14:24:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7f4bf8289
							
						
					 | 
					
						
						
							
							fix updating note detail after change from another client, closes #3292
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-06 14:19:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b0c60a046
							
						
					 | 
					
						
						
							
							improvements to notemap in relation to search
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-05 22:32:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d4776f577
							
						
					 | 
					
						
						
							
							better titles in delete dialog, #3290
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-05 15:30:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a539dc514
							
						
					 | 
					
						
						
							
							don't filter on root hoisted note
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-03 21:40:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a707e7abf4
							
						
					 | 
					
						
						
							
							Merge pull request #3288 from eliandoran/feature/filter_edited_notes_when_hoisted
						
						
						
						
						
						
						
						Filter "Edited notes" when hoisted or in a workspace 
						
						
							
						
					 | 
					
						2022-11-03 21:38:56 +01:00 | 
					
					
						
						
							
							
							
						
					 |