zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7d57bc08f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/beta' into beta
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
							
						
					 | 
					
						2023-08-30 00:11:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							041758766a
							
						
					 | 
					
						
						
							
							allow specifying date created in the ETAPI, #4199
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-30 00:11:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							69980c798b
							
						
					 | 
					
						
						
							
							note autocomplete: Use backspace icon for delete text
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 23:07:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							4de6a803e9
							
						
					 | 
					
						
						
							
							jump to note list: Remove scroll when not needed
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 22:30:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							748c5064b5
							
						
					 | 
					
						
						
							
							jump to note list: Improve scroll bar position
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 22:21:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6e8966ecd
							
						
					 | 
					
						
						
							
							jump to note: Improve position of close button
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 22:15:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c247ba7c6
							
						
					 | 
					
						
						
							
							jump to note list: Improve layout
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 22:12:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							52b5711ecd
							
						
					 | 
					
						
						
							
							jump to note: Add "Create and link child note"
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 21:51:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vaifix
							
						 
					 | 
					
						
						
						
						
							
						
						
							58fe3a62af
							
						
					 | 
					
						
						
							
							Fix bug: Calendar display incorrect tooltips.
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-28 20:43:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							af4d0c3ba6
							
						
					 | 
					
						
						
							
							jump to note list: Improve layout slightly
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-26 17:52:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							4bba0aa842
							
						
					 | 
					
						
						
							
							jump to note list: Re-enable styling
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-26 17:52:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae9af8ea23
							
						
					 | 
					
						
						
							
							jump to note list: Use a proper height to the container
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-26 17:52:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							eea29aba0e
							
						
					 | 
					
						
						
							
							jump to note list: Don't close jump to note results on lost focus
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-26 17:51:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
						
						
							
						
						
							abbd0b50eb
							
						
					 | 
					
						
						
							
							jump to note list: Use a fixed container instead of dropdown
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-26 17:51:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vaifix
							
						 
					 | 
					
						
						
						
						
							
						
						
							739ab28763
							
						
					 | 
					
						
						
							
							Resolve autocomplete error
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-25 13:01:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c551eae651
							
						
					 | 
					
						
						
							
							Merge pull request #4188 from rauenzi/master
						
						
						
						
						
						
						
						Update JSDoc & API Docs 
						
						
							
						
					 | 
					
						2023-08-21 23:46:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zack Rauen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5aea26960
							
						
					 | 
					
						
						
							
							Update API Docs
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-21 04:18:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zack Rauen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3730ac1a9
							
						
					 | 
					
						
						
							
							Fix and improve JSDoc for APIs
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-21 04:15:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2a510e4c5
							
						
					 | 
					
						
						
							
							cleanup of old migrations, since upgrading to 0.61 is possible only from 0.60.
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-18 15:56:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4717242dc7
							
						
					 | 
					
						
						
							
							force migration to 0.60 first before 0.61 #4132
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-18 15:55:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5ef09e779
							
						
					 | 
					
						
						
							
							hide canvas buttons which don't work, #4182
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-18 15:33:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d706b3a447
							
						
					 | 
					
						
						
							
							fix saving revisions for non-text types, closes #4176
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-17 16:39:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c96cca3a5
							
						
					 | 
					
						
						
							
							add 200ms timeout to api.getTextEditor() and similar #4174
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-17 16:31:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1865f8564
							
						
					 | 
					
						
						
							
							small refactor
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-17 09:09:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							515c5411a6
							
						
					 | 
					
						
						
							
							release 0.61.5-beta
						
						
						
						
						
						
							
 v0.61.5-beta
						
					 | 
					
						2023-08-16 23:02:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f7a5504c7
							
						
					 | 
					
						
						
							
							prettier config
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-16 20:31:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c7c37cf98
							
						
					 | 
					
						
						
							
							updates
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-16 20:12:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d93e00adce
							
						
					 | 
					
						
						
							
							Merge pull request #4168 from soulsands/button-style
						
						
						
						
						
						
						
						fix: launcher-button style 
						
						
							
						
					 | 
					
						2023-08-16 00:02:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e16e48db6
							
						
					 | 
					
						
						
							
							scroll beyond last line in text/code editor, fixes #2728
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 22:50:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0f48c0e99
							
						
					 | 
					
						
						
							
							mermaid 10.3.1
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 10:30:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							abedf2bba4
							
						
					 | 
					
						
						
							
							fix pasting into ckeditor, upgrade to v39.0.1
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 10:25:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb0137b2fd
							
						
					 | 
					
						
						
							
							fix displaying options / book on firefox, closes #4165
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 10:25:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c54c7d17d
							
						
					 | 
					
						
						
							
							save enex images as attachment, fixes #4163
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 10:25:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“soulsands”
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd95adcecb
							
						
					 | 
					
						
						
							
							fix: launcher-button style
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-15 16:11:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							90255ac55b
							
						
					 | 
					
						
						
							
							release 0.61.4-beta
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-10 23:49:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e741c2826c
							
						
					 | 
					
						
						
							
							release 0.61.4-beta
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-10 23:48:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							026992db78
							
						
					 | 
					
						
						
							
							release 0.61.4-beta
						
						
						
						
						
						
							
 v0.61.4-beta
						
					 | 
					
						2023-08-10 23:46:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							33780c1e17
							
						
					 | 
					
						
						
							
							fix note tooltip code rendering
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-10 13:50:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ede9c43f67
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-10 13:40:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c12ac4eee
							
						
					 | 
					
						
						
							
							fix CKEditor crashing
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-10 13:40:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							522518cf0d
							
						
					 | 
					
						
						
							
							disambiguous query
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-09 23:12:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d869d25c2
							
						
					 | 
					
						
						
							
							fix #clipperInbox, closes #4153
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-09 23:00:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9cdd93cb4
							
						
					 | 
					
						
						
							
							added options to disable auto-opening of promoted attributes and edited notes ribbon tabs, closes #4151
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-09 22:50:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							4240da349d
							
						
					 | 
					
						
						
							
							add shared info to mobile layout, closes #4147
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-09 00:02:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c257bc07a8
							
						
					 | 
					
						
						
							
							clipper now creates notes with image attachments instead of image notes
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-09 00:01:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							00eaa16985
							
						
					 | 
					
						
						
							
							clipper now creates notes with image attachments instead of image notes
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-08 23:42:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							fefb059564
							
						
					 | 
					
						
						
							
							clipper now creates notes with image attachments instead of image notes
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-08 23:07:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9166765ced
							
						
					 | 
					
						
						
							
							fix include note sizing when in readonly mode, closes #4135
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-08 22:56:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ae7661603
							
						
					 | 
					
						
						
							
							note path validation
						
						
						
						
						
						
							
						
					 | 
					
						2023-08-02 23:23:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							30e75056bd
							
						
					 | 
					
						
						
							
							release 0.61.3-beta
						
						
						
						
						
						
							
 v0.61.3-beta
						
					 | 
					
						2023-07-31 23:03:45 +02:00 | 
					
					
						
						
							
							
							
						
					 |