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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						389097bcc2
					 | 
					
						
						
							
							build: Silence clean-up phase
						
						
						
						
						
						
					 | 
					
						2024-07-20 20:31:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						366e791e2d
					 | 
					
						
						
							
							build: Use--omit=dev
						
						
						
						
						
						
					 | 
					
						2024-07-20 20:19:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						d570b3c428
					 | 
					
						
						
							
							build: Move rimraf to devDependencies
						
						
						
						
						
						
					 | 
					
						2024-07-20 20:18:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						3b3f676964
					 | 
					
						
						
							
							server: Update ini, debounce
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						77ddf529ac
					 | 
					
						
						
							
							server: Update https-proxy-agent, sax
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						ba74f39d86
					 | 
					
						
						
							
							server: Update semver, async-mutex
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						76890de33b
					 | 
					
						
						
							
							server: Update dayjs
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						e9860e9523
					 | 
					
						
						
							
							server: Update axios, ejs
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						44d095777c
					 | 
					
						
						
							
							server: Update ws
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						af726eff6c
					 | 
					
						
						
							
							server: Update jsdom
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						abd860754f
					 | 
					
						
						
							
							server: Update express, express-rate-limit
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						1a5b3ab0e3
					 | 
					
						
						
							
							server: Update yauzl
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						8a507d3cc0
					 | 
					
						
						
							
							server: Update sanitize-url, archiver, marked, sanitize-html, turndown
						
						
						
						
						
						
					 | 
					
						2024-07-20 19:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						645c16e450
					 | 
					
						
						
							
							Merge pull request #228 from TriliumNext/feature/update_to_node20
						
						
						
						
						
						
						
						Update Node.js version 
						
						
					 | 
					
						2024-07-20 19:06:21 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						338012ec7e
					 | 
					
						
						
							
							build: Bring update script for better-sqlite3
						
						
						
						
						
						
					 | 
					
						2024-07-20 16:48:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						e778680e94
					 | 
					
						
						
							
							Merge branch 'feature/update_to_node20' into feature/update_electron
						
						
						
						
						
						
					 | 
					
						2024-07-20 16:39:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						9b9180e5c8
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into feature/update_to_node20
						
						
						
						
						
						
					 | 
					
						2024-07-20 16:30:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						460bd6b979
					 | 
					
						
						
							
							ci: Always build main for update branches
						
						
						
						
						
						
					 | 
					
						2024-07-20 16:30:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						45a751ac6c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/update_to_node20' into feature/update_electron
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:27:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						c080dab9fa
					 | 
					
						
						
							
							Revert "ci: Build main temporarily"
						
						
						
						
						
						
						
						This reverts commit 776d2e7402. 
						
						
					 | 
					
						2024-07-20 15:24:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						75ccf9c3a7
					 | 
					
						
						
							
							Merge pull request #232 from TriliumNext/feature/update_tooling_dependencies
						
						
						
						
						
						
						
						Update tooling dependencies 
						
						
					 | 
					
						2024-07-20 15:22:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						66415abe8a
					 | 
					
						
						
							
							server: Remove dependency to "open", closes #221
						
						
						
						
						
						
						
						This is a very old dependency from 2018:
aa2bbc6575
It is no longer used. 
						
						
					 | 
					
						2024-07-20 15:21:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						431e04d039
					 | 
					
						
						
							
							build: Update rimraf, webpack, nodemon, jsdoc
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:21:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						946a02fd67
					 | 
					
						
						
							
							build: Determine better-sqlite3 version automatically
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						6a7f95f75b
					 | 
					
						
						
							
							Revert "ci: Build main temporarily"
						
						
						
						
						
						
						
						This reverts commit 79871dce638f47a86f673daa36cec84daa37c6ae. 
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						2a57765dd9
					 | 
					
						
						
							
							build: Update bettersqlite3 binary for Linux server
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						42c0a557b4
					 | 
					
						
						
							
							build: Update bettersqlite3 binary for Linux desktop
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						aa6cf1f11c
					 | 
					
						
						
							
							build: Update bettersqlite3 binary for macOS
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						d73b10d10d
					 | 
					
						
						
							
							build: Update bettersqlite3 binary for Windows
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						6aea3b1472
					 | 
					
						
						
							
							Revert "build: Investigate not embedding better_sqlite3 natives"
						
						
						
						
						
						
						
						This reverts commit 0e10fbb0875e515b6c10d4d010fe81464b41f6b4. 
						
						
					 | 
					
						2024-07-20 15:13:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						edc18e5be8
					 | 
					
						
						
							
							Revert "build: Fix ".node is not a valid Win32 application""
						
						
						
						
						
						
						
						This reverts commit 8ac84e12c8dd2a838bf602e032b08d507b9d763b. 
						
						
					 | 
					
						2024-07-20 15:13:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						86659552ee
					 | 
					
						
						
							
							build: Fix ".node is not a valid Win32 application"
						
						
						
						
						
						
						
						See https://github.com/electron/packager/issues/740. 
						
						
					 | 
					
						2024-07-20 15:13:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						03ab41bfba
					 | 
					
						
						
							
							build: Investigate not embedding better_sqlite3 natives
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:13:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
						
						956beb1cc0
					 | 
					
						
						
							
							server: Update better-sqlite3 from 8.5.0 to 11.1.2
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:12:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |