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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							946a02fd67
							
						
					 | 
					
						
						
							
							build: Determine better-sqlite3 version automatically
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9db4e1d7d3
							
						
					 | 
					
						
						
							
							build: Fix Node version incompatibility
						
						
						
						
						
						
					 | 
					
						2024-07-20 15:10:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							05776d178e
							
						
					 | 
					
						
						
							
							docs: Move binaries to bin/
						
						
						
						
						
						
					 | 
					
						2024-07-20 13:14:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e74b7f6964
							
						
					 | 
					
						
						
							
							build: Update NODE_VERSION in build-server
						
						
						
						
						
						
					 | 
					
						2024-07-17 01:08:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bbbbc3b860
							
						
					 | 
					
						
						
							
							bin/build*: Adjust error tolerance
						
						
						
						
						
						
					 | 
					
						2024-07-14 21:48:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c9f27547a2
							
						
					 | 
					
						
						
							
							bin/build*: Check if dpkg-deb tool is correct
						
						
						
						
						
						
					 | 
					
						2024-07-14 21:45:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6bf063b92f
							
						
					 | 
					
						
						
							
							bin/build*: Check that required binaries are present
						
						
						
						
						
						
					 | 
					
						2024-07-14 21:35:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4862b324a5
							
						
					 | 
					
						
						
							
							bin/release: Get rid of sponge
						
						
						
						
						
						
					 | 
					
						2024-07-14 21:13:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f678c4337b
							
						
					 | 
					
						
						
							
							bin/release: Fail if jq is missing
						
						
						
						
						
						
					 | 
					
						2024-07-14 21:12:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							595402adea
							
						
					 | 
					
						
						
							
							dev: Fix npm start-electron script
						
						
						
						
						
						
					 | 
					
						2024-07-14 13:03:06 +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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5b30bae5b2
							
						
					 | 
					
						
						
							
							bin: Adapt copy-trilium to TypeScript changes
						
						
						
						
						
						
					 | 
					
						2024-07-13 21:11:03 +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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d18bfb9d69
							
						
					 | 
					
						
						
							
							docker: Fix build by generating artifacts
						
						
						
						
						
						
					 | 
					
						2024-07-13 11:40:52 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							60d134a89b
							
						
					 | 
					
						
						
							
							Revert "docker: Fix webpack"
						
						
						
						
						
						
						
						This reverts commit 0a7fcf399fb854a29c405d2d79f579d5a910bcc1. 
						
						
					 | 
					
						2024-07-13 11:32:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0a7fcf399f
							
						
					 | 
					
						
						
							
							docker: Fix webpack
						
						
						
						
						
						
					 | 
					
						2024-07-13 11:06:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Caleb Norton
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0d30dbe49
							
						
					 | 
					
						
						
							
							Add macos arm64 to release script
						
						
						
						
						
						
					 | 
					
						2024-05-18 03:48:33 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Caleb Norton
							
						 
					 | 
					
						
						
						
						
							
						
						
							d142d3261d
							
						
					 | 
					
						
						
							
							support compiling native arm64 macos builds
						
						
						
						
						
						
					 | 
					
						2024-05-18 03:34:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alexpietsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2604e91d4
							
						
					 | 
					
						
						
							
							feat: add ts script for cross plattform use
						
						
						
						
						
						
					 | 
					
						2024-05-01 00:05:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2b4eaf9cc
							
						
					 | 
					
						
						
							
							fix: copy only necessary modules
						
						
						
						
						
						
					 | 
					
						2024-04-29 23:37:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c0ce174b5
							
						
					 | 
					
						
						
							
							fix: script permissions
						
						
						
						
						
						
					 | 
					
						2024-04-29 14:54:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alexpietsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8adf2a685
							
						
					 | 
					
						
						
							
							fix: restore start-electron script functionality
						
						
						
						
						
						
					 | 
					
						2024-04-29 00:36:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							db2b33704f
							
						
					 | 
					
						
						
							
							Merge branch 'feature/typescript_backend' into feature/typescript_backend_2
						
						
						
						
						
						
					 | 
					
						2024-03-30 10:54:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexei Kharchev
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb8bfc61ed
							
						
					 | 
					
						
						
							
							Improved scriptes bin/copy-trilium.sh, bin/build-linux-x64.sh
						
						
						
						
						
						
					 | 
					
						2024-03-02 14:18:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexei Kharchev
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff5d5d20d9
							
						
					 | 
					
						
						
							
							Reduce warnings count caused by bin/copy-trilium.sh
						
						
						
						
						
						
					 | 
					
						2024-03-02 11:49:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9826fed905
							
						
					 | 
					
						
						
							
							server-ts: Port app* services
						
						
						
						
						
						
					 | 
					
						2024-02-17 19:09:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elian Doran
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a06aa9df8a
							
						
					 | 
					
						
						
							
							server-ts: Port anonymization service
						
						
						
						
						
						
					 | 
					
						2024-02-17 19:02:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf99345962
							
						
					 | 
					
						
						
							
							use .js extension for require() as a preparation for future migration to ESM
						
						
						
						
						
						
					 | 
					
						2023-11-22 19:34:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							45ed436426
							
						
					 | 
					
						
						
							
							added runOnBranchChange event #4108
						
						
						
						
						
						
					 | 
					
						2023-11-02 23:26:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							52244ddc99
							
						
					 | 
					
						
						
							
							Merge branch 'beta'
						
						
						
						
						
						
						
						# Conflicts:
#	docs/backend_api/BAttachment.html
#	docs/backend_api/BNote.html
#	docs/backend_api/BackendScriptApi.html
#	package-lock.json
#	package.json 
						
						
					 | 
					
						2023-10-19 01:13:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2132cf3bdc
							
						
					 | 
					
						
						
							
							nodejs 18.18.2
						
						
						
						
						
						
					 | 
					
						2023-10-18 09:40:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd7fa16e96
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2023-10-09 23:08:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							846ac9305e
							
						
					 | 
					
						
						
							
							don't anonymize option notes
						
						
						
						
						
						
					 | 
					
						2023-10-09 23:08:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zack Rauen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3540772dd
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into share
						
						
						
						
						
						
					 | 
					
						2023-10-08 17:19:32 -04:00 | 
					
					
						
						
							
							
							
						
					 |