zadam
							
						 
					 | 
					
						
						
							
						
						6dfc72c065
					 | 
					
						
						
							
							many small fixes from Intellij analysis
						
						
						
						
						
						
					 | 
					
						2023-05-05 23:17:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						cd01886eb2
					 | 
					
						
						
							
							attachment revision upload
						
						
						
						
						
						
					 | 
					
						2023-05-03 22:49:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5e2efca933
					 | 
					
						
						
							
							scheduled erasure of attachments WIP
						
						
						
						
						
						
					 | 
					
						2023-04-21 00:19:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						e71b0d82a1
					 | 
					
						
						
							
							scheduled attachment deletion WIP
						
						
						
						
						
						
					 | 
					
						2023-04-20 00:11:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						54c0268593
					 | 
					
						
						
							
							attachment improvements
						
						
						
						
						
						
					 | 
					
						2023-04-11 17:45:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						15a11daf38
					 | 
					
						
						
							
							Merge branch 'master' into next60
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json 
						
						
					 | 
					
						2023-04-10 18:52:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soulsands
							
						 
					 | 
					
						
						
							
						
						a0ac603260
					 | 
					
						
						
							
							fix:Remove duplicates in character class
						
						
						
						
						
						
					 | 
					
						2023-04-08 21:07:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9be524ef89
					 | 
					
						
						
							
							attachment improvements
						
						
						
						
						
						
					 | 
					
						2023-03-24 10:57:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f50a9c250a
					 | 
					
						
						
							
							many small issues found by intellij analysis
						
						
						
						
						
						
					 | 
					
						2023-01-15 21:04:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1b24276a4a
					 | 
					
						
						
							
							always use template strings instead of string concatenation
						
						
						
						
						
						
					 | 
					
						2022-12-21 15:19:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5ac332960e
					 | 
					
						
						
							
							note launchers by default open in the active note context but follow the same logic with ctrl/middle click as links
						
						
						
						
						
						
					 | 
					
						2022-12-09 16:48:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						44997f5cd1
					 | 
					
						
						
							
							options fixes
						
						
						
						
						
						
					 | 
					
						2022-12-08 15:18:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						56e01046c8
					 | 
					
						
						
							
							Merge branch 'master' into next58
						
						
						
						
						
						
					 | 
					
						2022-12-03 13:28:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						518a413de7
					 | 
					
						
						
							
							fix internal link creation, closes #3376
						
						
						
						
						
						
					 | 
					
						2022-12-03 13:26:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						720fb0f73e
					 | 
					
						
						
							
							refactorted shortcut handling into a service
						
						
						
						
						
						
					 | 
					
						2022-12-01 00:17:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						7a8c69a6f9
					 | 
					
						
						
							
							fix jumping cursor position after closing a dialog, fixes #3325
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:48:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						723db97094
					 | 
					
						
						
							
							fix jumping cursor position after closing a dialog, fixes #3325
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:47:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						44b68326a0
					 | 
					
						
						
							
							close hanging autocomplete on dialog close, fixes #3241
						
						
						
						
						
						
					 | 
					
						2022-10-26 16:52:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c7acfd4d4e
					 | 
					
						
						
							
							fix clicking internal link in the ckeditor toolbar, closes #3236
						
						
						
						
						
						
					 | 
					
						2022-10-26 14:11:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4cec856e21
					 | 
					
						
						
							
							simplified updating note content
						
						
						
						
						
						
					 | 
					
						2022-06-13 22:38:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5fbaed61c1
					 | 
					
						
						
							
							fix "cut to note", closes #2895, #1182
						
						
						
						
						
						
					 | 
					
						2022-06-03 22:05:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f250b72563
					 | 
					
						
						
							
							findwidget in read only notes WIP
						
						
						
						
						
						
					 | 
					
						2022-05-25 23:38:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						e87e065100
					 | 
					
						
						
							
							protected session expiration timer moved to backend, closes #2847
						
						
						
						
						
						
					 | 
					
						2022-05-13 23:20:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom
							
						 
					 | 
					
						
						
							
						
						a168edb168
					 | 
					
						
						
							
							move sleep to general utisl function
						
						
						
						
						
						
					 | 
					
						2022-05-09 16:54:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						91dec23d5e
					 | 
					
						
						
							
							ETAPI auth, spec improvements etc.
						
						
						
						
						
						
					 | 
					
						2022-01-10 17:09:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3860028a9e
					 | 
					
						
						
							
							sharing WIP
						
						
						
						
						
						
					 | 
					
						2021-12-20 17:30:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						89322c4b03
					 | 
					
						
						
							
							upgrade to electron v16 and node v16
						
						
						
						
						
						
					 | 
					
						2021-11-16 22:43:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a0caa21458
					 | 
					
						
						
							
							global link map WIP
						
						
						
						
						
						
					 | 
					
						2021-09-17 22:34:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						66374bf95f
					 | 
					
						
						
							
							improvements in frontend sync (WIP)
						
						
						
						
						
						
					 | 
					
						2021-08-24 22:59:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						208baa56e9
					 | 
					
						
						
							
							error handling
						
						
						
						
						
						
					 | 
					
						2021-02-22 21:59:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fbbd51d0b1
					 | 
					
						
						
							
							small changes for better debugging infos
						
						
						
						
						
						
					 | 
					
						2021-02-20 23:17:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ec2e973165
					 | 
					
						
						
							
							allow only valid attr name characters for relation map relations, closes #1649
						
						
						
						
						
						
					 | 
					
						2021-02-17 23:22:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b936a63db3
					 | 
					
						
						
							
							improvements to the search spec help button
						
						
						
						
						
						
					 | 
					
						2021-01-26 14:44:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f988935a33
					 | 
					
						
						
							
							fixed & refactored opening/downloading file notes
						
						
						
						
						
						
					 | 
					
						2020-11-05 21:26:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ceb762e56b
					 | 
					
						
						
							
							fix zen mode with attributes, closes #1213
						
						
						
						
						
						
					 | 
					
						2020-09-04 23:35:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						ef996f3919
					 | 
					
						
						
							
							bug fixes
						
						
						
						
						
						
					 | 
					
						2020-08-27 22:03:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fbe3995398
					 | 
					
						
						
							
							fixed tree hotkeys
						
						
						
						
						
						
					 | 
					
						2020-08-26 22:12:01 +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
							
						 
					 | 
					
						
						
							
						
						95bbdb3b6b
					 | 
					
						
						
							
							CKEditor 21
						
						
						
						
						
						
					 | 
					
						2020-07-29 23:34:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						a574fce13f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable' into syncification
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js 
						
						
					 | 
					
						2020-06-24 22:08:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						89356918f1
					 | 
					
						
						
							
							fix unescaped HTML in the tree node title, closes #1127
						
						
						
						
						
						
					 | 
					
						2020-06-24 21:07:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						6a957eff17
					 | 
					
						
						
							
							added autocompletes for labels, relations
						
						
						
						
						
						
					 | 
					
						2020-05-28 23:59:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						99aa481ace
					 | 
					
						
						
							
							refactoring for testing parser
						
						
						
						
						
						
					 | 
					
						2020-05-20 00:03:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						6161b1c193
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
					 | 
					
						2020-04-29 22:27:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						86cf8f3202
					 | 
					
						
						
							
							fix download/export
						
						
						
						
						
						
					 | 
					
						2020-04-27 20:58:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						586d6b4557
					 | 
					
						
						
							
							in web version use local client time instead of server time for recording dateModified etc.
						
						
						
						
						
						
					 | 
					
						2020-04-26 14:26:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |