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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2711cfb7b
							
						
					 | 
					
						
						
							
							verify that the uploaded modified file is temporary
						
						
						
						
						
						
					 | 
					
						2024-05-18 05:50:46 +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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1372cc1cb9
							
						
					 | 
					
						
						
							
							server-ts: Fix regression
						
						
						
						
						
						
					 | 
					
						2024-04-15 21:20:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							dededcd303
							
						
					 | 
					
						
						
							
							server-ts: Port routes/routes
						
						
						
						
						
						
					 | 
					
						2024-04-11 23:00:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							39e152b0b9
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_10
						
						
						
						
						
						
					 | 
					
						2024-04-09 21:46:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2a99ecc384
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_9
						
						
						
						
						
						
					 | 
					
						2024-04-09 21:45:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							22477f90ae
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_8
						
						
						
						
						
						
					 | 
					
						2024-04-09 21:45:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d8c2ba0ed8
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_7
						
						
						
						
						
						
					 | 
					
						2024-04-09 21:44:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							74441273a8
							
						
					 | 
					
						
						
							
							server-ts: Fix getAttribute permitting null
						
						
						
						
						
						
					 | 
					
						2024-04-09 21:43:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5fdf094e9d
							
						
					 | 
					
						
						
							
							server-ts: Convert etapi/notes
						
						
						
						
						
						
					 | 
					
						2024-04-07 16:56:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							34cd2eba91
							
						
					 | 
					
						
						
							
							server-ts: Remove use of (req as any)
						
						
						
						
						
						
					 | 
					
						2024-04-07 14:29:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6e042c20e9
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/tree
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:34:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7a98718e64
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/sync
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:28:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6bbb1f8404
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/stats
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:15:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cecfc4cd34
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/sql
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:12:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c1875a8c8f
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/special_notes
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:11:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							249e81c9eb
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/similar_notes
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:09:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5804dc52bc
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/setup
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:08:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							90cf913083
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/sender
						
						
						
						
						
						
					 | 
					
						2024-04-06 23:01:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fa82158e30
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/search
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:48:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							de42df40bb
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/script
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:38:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6265aa99d3
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/revisions
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:32:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4ab6f159e5
							
						
					 | 
					
						
						
							
							server-ts: Fix "Missing or incorrect type for target branch ID"
						
						
						
						
						
						
						
						When attempting to add a new note from the relation map 
						
						
					 | 
					
						2024-04-06 22:17:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b50ceaf299
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/relation-map
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:13:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							96c8c9080d
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/recent_notes
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:07:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							66d7548046
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/recent_changes
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:07:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4b1c351195
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/password
						
						
						
						
						
						
					 | 
					
						2024-04-06 22:00:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							eb7a7e4988
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/other
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:58:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3d75366f02
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/options
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:57:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c63c7d518c
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/notes
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:55:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							37697c7db7
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/note_map
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:45:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b1744c3867
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/login
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:34:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b0d6035a67
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/keys
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:31:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3902719008
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/import
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:30:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							291b791b67
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/image
						
						
						
						
						
						
					 | 
					
						2024-04-06 21:21:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b552f40ae8
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/fonts
						
						
						
						
						
						
					 | 
					
						2024-04-05 22:24:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0ab137de03
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/files
						
						
						
						
						
						
					 | 
					
						2024-04-05 22:22:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							952c3cc12f
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/export
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:58:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e451237361
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/etapi_tokens
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:56:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							27637b0483
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/consistency_checks
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:55:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							122ff3bb1d
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/cloning
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:47:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f98f84d419
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/bnote
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:45:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							40ef533c5f
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/bulk_action
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:36:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fd77c5e8c4
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/branches
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:33:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							706b9d0f46
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/backend_log
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:28:19 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							82f5553980
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/autocomplete
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:26:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c0349b3f84
							
						
					 | 
					
						
						
							
							server-ts: Convert routes/api/attributes
						
						
						
						
						
						
					 | 
					
						2024-04-05 20:22:10 +03:00 | 
					
					
						
						
							
							
							
						
					 |