Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							79123b0c63 
							
						 
					 
					
						
						
							
							server: Fix import of non-text files  
						
						
						
						
					 
					
						2024-07-14 15:21:45 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f40257b591 
							
						 
					 
					
						
						
							
							Merge pull request  #206  from TriliumNext/bugfix/image_upload_regression  
						
						... 
						
						
						
						server: Fix regression in uploading images 
						
						
					 
					
						2024-07-14 11:07:34 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1dad4bc80f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/port_0.63.7  
						
						
						
						
					 
					
						2024-07-14 09:58:37 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0792714e45 
							
						 
					 
					
						
						
							
							server: Fix regression in uploading images  
						
						... 
						
						
						
						The attachment is first saved with no content while the image is being
asynchronously resized. On our side we had a guard condition fail if the
content was empty, whereas the original implementation was simply using
an empty string instead. 
						
						
					 
					
						2024-07-14 09:52:01 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d5c1bd1085 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7  
						
						... 
						
						
						
						; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts 
						
						
					 
					
						2024-07-13 18:36:04 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							606490a611 
							
						 
					 
					
						
						
							
							server: Remove log and fix whitespace  
						
						
						
						
					 
					
						2024-07-13 16:56:13 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d99cc11d8b 
							
						 
					 
					
						
						
							
							server: Fix import of notes with type=file  
						
						
						
						
					 
					
						2024-07-13 16:52:31 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1b0690ddfc 
							
						 
					 
					
						
						
							
							server: Fix note type import  
						
						... 
						
						
						
						A regression caused by the port to TypeScript caused all note types to
be treated as a "text" instead of other types such as canvas. The MIME
type, however, was unaffected. 
						
						
					 
					
						2024-07-13 16:43:33 +03:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
						
						
							
						
						
							17fac31cd1 
							
						 
					 
					
						
						
							
							convert es6 tests to ts  
						
						
						
						
					 
					
						2024-06-09 12:16:09 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							82a437f2a8 
							
						 
					 
					
						
						
							
							remove unnecessary debounce which caused missed changes  
						
						
						
						
					 
					
						2024-05-30 06:55:45 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a64a0e52ec 
							
						 
					 
					
						
						
							
							Merge branch 'refs/heads/stable'  
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
					 
					
						2024-05-30 06:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c7e2e48f 
							
						 
					 
					
						
						
							
							error handling  
						
						
						
						
					 
					
						2024-05-30 06:25:03 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							305d28b5b3 
							
						 
					 
					
						
						
							
							remove warning about the relation map - trilium is sunsetting anyway, there's no point now in deprecating this feature,  fixes   #4779  
						
						
						
						
					 
					
						2024-05-30 06:24:50 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a88bf68eb6 
							
						 
					 
					
						
						
							
							verify that the uploaded modified file is temporary  
						
						... 
						
						
						
						(cherry picked from commit a2711cfb7b5b454182393aa160e45ccbf52c949d) 
						
						
					 
					
						2024-05-30 06:10:30 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							25b49e1ca2 
							
						 
					 
					
						
						
							
							release 0.63.6  
						
						
						
						
					 
					
						2024-05-18 06:17:21 +02:00 
						 
				 
			
				
					
						
							
							
								zadam 
							
						 
					 
					
						
						
						
						
							
						
						
							a2711cfb7b 
							
						 
					 
					
						
						
							
							verify that the uploaded modified file is temporary  
						
						
						
						
					 
					
						2024-05-18 05:50:46 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ade6d08ded 
							
						 
					 
					
						
						
							
							Merge pull request  #67  from TriliumNext/fix/EtapiError-prototype  
						
						... 
						
						
						
						fix: set prototype 
						
						
					 
					
						2024-05-08 21:37:36 +03:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
						
						
							
						
						
							5f539427a9 
							
						 
					 
					
						
						
							
							fix: set prototype  
						
						
						
						
					 
					
						2024-05-05 12:40:00 +02:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
						
						
							
						
						
							3e82d30a32 
							
						 
					 
					
						
						
							
							fix: skipLibCheck  
						
						
						
						
					 
					
						2024-05-01 11:32:08 +02:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a68b75f069 
							
						 
					 
					
						
						
							
							Merge pull request  #48  from TriliumNext/feature/typescript_backend_11  
						
						... 
						
						
						
						Convert backend to TypeScript (89% -> 92%, final) 
						
						
					 
					
						2024-04-20 09:37:19 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2771bd4ece 
							
						 
					 
					
						
						
							
							Merge pull request  #47  from TriliumNext/feature/typescript_backend_10  
						
						... 
						
						
						
						Convert backend to TypeScript (84% -> 89%) 
						
						
					 
					
						2024-04-20 09:36:08 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							19cf9df52c 
							
						 
					 
					
						
						
							
							Merge pull request  #45  from TriliumNext/feature/typescript_backend_9  
						
						... 
						
						
						
						Convert backend to TypeScript (81% -> 84%) 
						
						
					 
					
						2024-04-20 09:35:18 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							15168fb213 
							
						 
					 
					
						
						
							
							server-ts: Use unknown for validators  
						
						
						
						
					 
					
						2024-04-18 21:26:29 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0d700d6951 
							
						 
					 
					
						
						
							
							server-ts: Address review  
						
						
						
						
					 
					
						2024-04-17 23:00:02 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							67cb02ed92 
							
						 
					 
					
						
						
							
							server-ts: Address some more review comments  
						
						
						
						
					 
					
						2024-04-17 22:54:05 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1d1ccc8d63 
							
						 
					 
					
						
						
							
							server-ts: Fix regression  
						
						
						
						
					 
					
						2024-04-17 22:49:41 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							262e4db0f2 
							
						 
					 
					
						
						
							
							server-ts: Remove unnecessary type comments  
						
						
						
						
					 
					
						2024-04-17 22:35:38 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c814187a25 
							
						 
					 
					
						
						
							
							server-ts: Address review  
						
						
						
						
					 
					
						2024-04-17 22:24:27 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							138be84e45 
							
						 
					 
					
						
						
							
							server-ts: Address requested changes  
						
						
						
						
					 
					
						2024-04-16 21:10:39 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							625d935f08 
							
						 
					 
					
						
						
							
							Merge pull request  #44  from TriliumNext/feature/typescript_backend_8  
						
						... 
						
						
						
						Convert backend to TypeScript (80% -> 81%) 
						
						
					 
					
						2024-04-16 21:01:20 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							98d12901a5 
							
						 
					 
					
						
						
							
							Merge pull request  #43  from TriliumNext/feature/typescript_backend_7  
						
						... 
						
						
						
						Convert backend to TypeScript (71% -> 80%) 
						
						
					 
					
						2024-04-15 21:51:00 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1372cc1cb9 
							
						 
					 
					
						
						
							
							server-ts: Fix regression  
						
						
						
						
					 
					
						2024-04-15 21:20:59 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a072016fc5 
							
						 
					 
					
						
						
							
							Merge pull request  #42  from TriliumNext/feature/typescript_backend_6  
						
						... 
						
						
						
						Convert backend to TypeScript (67% -> 71%) 
						
						
					 
					
						2024-04-15 21:12:55 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							97230ca82a 
							
						 
					 
					
						
						
							
							server-ts: Remove some esdoc types  
						
						
						
						
					 
					
						2024-04-15 21:12:34 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c69384b5d 
							
						 
					 
					
						
						
							
							Merge pull request  #41  from TriliumNext/feature/typescript_backend_5  
						
						... 
						
						
						
						Convert backend to TypeScript (64% -> 67%) 
						
						
					 
					
						2024-04-15 21:09:37 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a66e4435ba 
							
						 
					 
					
						
						
							
							server-ts: Address requested changes  
						
						
						
						
					 
					
						2024-04-13 17:30:48 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ae29699e65 
							
						 
					 
					
						
						
							
							server-ts: Port www  
						
						
						
						
					 
					
						2024-04-11 23:14:37 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9022bc338a 
							
						 
					 
					
						
						
							
							server-ts: Port app  
						
						
						
						
					 
					
						2024-04-11 23:03:19 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dededcd303 
							
						 
					 
					
						
						
							
							server-ts: Port routes/routes  
						
						
						
						
					 
					
						2024-04-11 23:00:24 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1ac65fff47 
							
						 
					 
					
						
						
							
							server-ts: Address requested changes  
						
						
						
						
					 
					
						2024-04-11 19:49:01 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17eda952e4 
							
						 
					 
					
						
						
							
							Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_10  
						
						
						
						
					 
					
						2024-04-10 19:29:00 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8629993fe4 
							
						 
					 
					
						
						
							
							Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_9  
						
						
						
						
					 
					
						2024-04-10 19:28:36 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8297e1a835 
							
						 
					 
					
						
						
							
							Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_8  
						
						
						
						
					 
					
						2024-04-10 19:28:10 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b517b18394 
							
						 
					 
					
						
						
							
							Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_7  
						
						
						
						
					 
					
						2024-04-10 19:27:31 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							32e34eec90 
							
						 
					 
					
						
						
							
							Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_6  
						
						
						
						
					 
					
						2024-04-10 19:26:30 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fb32ab9707 
							
						 
					 
					
						
						
							
							server-ts: Address requested changes  
						
						
						
						
					 
					
						2024-04-10 19:26:08 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c08393f04b 
							
						 
					 
					
						
						
							
							server-ts: Port share/routes  
						
						
						
						
					 
					
						2024-04-10 19:04:38 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							88aba1c844 
							
						 
					 
					
						
						
							
							server-ts: Port share/shaca/content_renderer  
						
						
						
						
					 
					
						2024-04-09 22:58:24 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7c76d28f75 
							
						 
					 
					
						
						
							
							server-ts: Port share/shaca/shaca_loader  
						
						
						
						
					 
					
						2024-04-09 22:49:05 +03:00 
						 
				 
			
				
					
						
							
							
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b3c2602620 
							
						 
					 
					
						
						
							
							server-ts: Port share/shaca/shaca  
						
						
						
						
					 
					
						2024-04-09 22:42:48 +03:00