Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							e74eff75db 
							
						 
					 
					
						
						
							
							Revert "build: Export correct build info"  
						
						 
						
						... 
						
						
						
						This reverts commit ef4f0f80b9e490e973453bf27951a975691f2727. 
						
						
							
						
					 
					
						2024-07-22 21:43:55 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb4a66127 
							
						 
					 
					
						
						
							
							build: Remove redundant rm  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:39:36 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							ef4f0f80b9 
							
						 
					 
					
						
						
							
							build: Export correct build info  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:35:24 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							dd14ba9e0e 
							
						 
					 
					
						
						
							
							build: Increase error strictness  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:33:07 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							c39d131426 
							
						 
					 
					
						
						
							
							ci: Add ESM change to main temporarily  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:23:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d6564a63 
							
						 
					 
					
						
						
							
							server: Fix share not working after ESM port  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:17:43 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							c20c8d1176 
							
						 
					 
					
						
						
							
							server: Fix init database not working due to share db  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 21:17:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							10239d1a0b 
							
						 
					 
					
						
						
							
							Merge branch 'feature/server_esm_part2' into feature/server_esm_part3  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 20:20:34 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a561565e 
							
						 
					 
					
						
						
							
							Merge branch 'feature/server_esm' into feature/server_esm_part2  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 20:15:49 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							e53b7dd297 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/server_esm  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 19:59:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							997da1c3bc 
							
						 
					 
					
						
						
							
							client: Change URL for checking updates (not testable yet)  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 19:40:00 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							c1b5eb086b 
							
						 
					 
					
						
						
							
							ci: Don't build main if only docs were changed  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 19:39:15 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nriver 
							
						 
					 
					
						
						
						
						
							
						
						
							cb9b4c07e5 
							
						 
					 
					
						
						
							
							translate some dialogs  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-22 17:31:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							043313c71a 
							
						 
					 
					
						
						
							
							Merge branch 'feature/update_electron' into feature/update_bettersqlite3  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 23:29:48 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							62804ec67a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/update_electron  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 23:28:03 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
						
						
							
						
						
							4edb0374fc 
							
						 
					 
					
						
						
							
							server: Fix "Content hash check for [...] sector [...] FAILED"  
						
						 
						
						... 
						
						
						
						The issue was caused by a guard condition which prevented the writing of
entity changes which came from the remote and were marked as deleted,
resulting in an incorrect checksum when attempting to sync. 
						
						
							
						
					 
					
						2024-07-21 21:14:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2e9a624bfd 
							
						 
					 
					
						
						
							
							release 0.90.1-beta  
						
						 
						
						
						
						
							
  v0.90.1-beta
 
						
					 
					
						2024-07-21 13:25:01 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							715a952148 
							
						 
					 
					
						
						
							
							build: Remove auth if token not provided  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 13:24:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d09578735e 
							
						 
					 
					
						
						
							
							build: Implement cross-platform build info script  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 11:45:31 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							374a51b77c 
							
						 
					 
					
						
						
							
							ci: Update build info for Windows setup as well  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 11:26:14 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a8442f3d8 
							
						 
					 
					
						
						
							
							build: Fix artifacts not generated due to name change  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 10:57:43 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f07a6600c9 
							
						 
					 
					
						
						
							
							ci: Patch package.json main  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 09:12:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b2f688a3e5 
							
						 
					 
					
						
						
							
							ci: Fix typo  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 08:53:21 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a7c447528 
							
						 
					 
					
						
						
							
							Merge pull request  #255  from TriliumNext/feature/windows_installer  
						
						 
						
						... 
						
						
						
						Windows installer 
						
						
							
						
					 
					
						2024-07-21 08:52:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							028565d89b 
							
						 
					 
					
						
						
							
							ci: Fix dev workflow no longer triggering  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 08:48:54 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b55e93c7c1 
							
						 
					 
					
						
						
							
							ci: Join workflows  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 08:37:18 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad7a29a700 
							
						 
					 
					
						
						
							
							ci: Try to fix missing assets in installer  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 00:31:36 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f49008bf21 
							
						 
					 
					
						
						
							
							ci: Improve workflow  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-21 00:02:43 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3ac643b3ac 
							
						 
					 
					
						
						
							
							build: Reorder scripts & rename artifact  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:56:28 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2e2400edb3 
							
						 
					 
					
						
						
							
							build: Improve product information in package.json  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:39:53 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6c36c47135 
							
						 
					 
					
						
						
							
							ci: Adapt to changes to package.json  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:34:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a5f7a3a029 
							
						 
					 
					
						
						
							
							build: Improve package.json for building with electron-forge  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:33:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							52af97c88f 
							
						 
					 
					
						
						
							
							build: Remove electron-builder  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:24:04 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dcb5d539b3 
							
						 
					 
					
						
						
							
							Fix removing dependency on electron  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 23:23:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							19e776b1f6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/windows_installer  
						
						 
						
						... 
						
						
						
						; Conflicts:
;	electron.js
;	package-lock.json
;	package.json 
						
						
							
						
					 
					
						2024-07-20 23:07:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f9a4f9b538 
							
						 
					 
					
						
						
							
							Merge pull request  #253  from TriliumNext/feature/update_ci  
						
						 
						
						... 
						
						
						
						CI improvements 
						
						
							
						
					 
					
						2024-07-20 22:28:26 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5277c3e6b6 
							
						 
					 
					
						
						
							
							ci: Revert artifact upload for darwin  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 22:23:31 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e380fa5224 
							
						 
					 
					
						
						
							
							ci: Fix permission issue with build script  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 22:10:09 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5eabdf8496 
							
						 
					 
					
						
						
							
							ci: Cancel unnecessary actions  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 22:03:51 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							128af66797 
							
						 
					 
					
						
						
							
							ci: Don't pack Windows artifact  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 22:02:29 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							80e647ffec 
							
						 
					 
					
						
						
							
							ci: Update build info  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 21:58:14 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7dc8c662ca 
							
						 
					 
					
						
						
							
							ci: Revert .tar.xz to avoid losing permissions  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 21:50:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cc55e1b657 
							
						 
					 
					
						
						
							
							ci: Remove .tar.xz to avoid double archiving  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 21:48:04 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							27c2d1efbd 
							
						 
					 
					
						
						
							
							ci: Fix double .zip artifact name  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 21:46:37 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4dc615fe68 
							
						 
					 
					
						
						
							
							ci: Fix double zipping  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 21:39:11 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9647738162 
							
						 
					 
					
						
						
							
							Merge pull request  #252  from TriliumNext/feature/update_reduce_binary_size  
						
						 
						
						... 
						
						
						
						Reduce dist size 
						
						
							
						
					 
					
						2024-07-20 21:33:21 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5b8148206d 
							
						 
					 
					
						
						
							
							Merge pull request  #251  from TriliumNext/feature/update_server_dependencies  
						
						 
						
						... 
						
						
						
						Update server dependencies 
						
						
							
						
					 
					
						2024-07-20 21:33:05 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							758c08ec85 
							
						 
					 
					
						
						
							
							build: Remove map files & ts files  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 20:55:38 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cb0d1d80a1 
							
						 
					 
					
						
						
							
							build: Remove some more unnecessary files  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 20:53:33 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elian Doran 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9dcf51b117 
							
						 
					 
					
						
						
							
							build: Remove some unnecessary files  
						
						 
						
						
						
						
							
						
					 
					
						2024-07-20 20:39:18 +03:00