7757 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Elian Doran	f382d3c728	Merge remote-tracking branch 'origin/feature/update_bettersqlite3' into feature/server_esm_part3	2024-07-24 00:02:15 +03:00
Elian Doran	fd1f43d192	Merge remote-tracking branch 'origin/feature/update_electron' into feature/server_esm_part3	2024-07-24 00:01:44 +03:00
Elian Doran	989462c1b8	electron: Fix Common.js import	2024-07-24 00:00:41 +03:00
Elian Doran	bd6ef06732	Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3	2024-07-23 23:43:00 +03:00
Elian Doran	b9a2be6808	Merge pull request #248 from TriliumNext/feature/i18n_first_steps ... i18n: First steps	2024-07-23 23:27:45 +03:00
Elian Doran	ece343ac09	dev: Improve custom translation framework slightly	2024-07-23 23:27:00 +03:00
Elian Doran	2fb05ab37d	Merge remote-tracking branch 'origin/develop' into feature/i18n_first_steps ... ; Conflicts: ; package-lock.json ; package.json	2024-07-23 23:22:34 +03:00
Elian Doran	de342c3285	dev: Set up key style & source language	2024-07-23 23:19:11 +03:00
Elian Doran	906dad62a8	dev: Set up i18n-ally	2024-07-23 22:52:34 +03:00
Elian Doran	1b5b3e697e	Merge branch 'feature/server_esm_part2' into feature/server_esm_part3	2024-07-23 19:15:59 +03:00
Elian Doran	3aa38b998a	server: Address requested changes	2024-07-23 19:14:33 +03:00
Elian Doran	45bf75b864	Merge branch 'feature/server_esm' into feature/server_esm_part2	2024-07-23 19:08:46 +03:00
Elian Doran	7f2caa00cb	test: Remove commented-out code	2024-07-23 19:07:39 +03:00
Elian Doran	e9e329c6dd	build: Fix Windows installer build	2024-07-23 00:26:02 +03:00
Elian Doran	faa9ebe1bc	build: Remove unnecessary rm	2024-07-23 00:24:27 +03:00
Elian Doran	26efa9299e	build: Fix export =	2024-07-23 00:17:20 +03:00
Elian Doran	3dbf8fb1c1	build: Fix running webpack on ESM	2024-07-23 00:12:08 +03:00
Elian Doran	6f6ce38538	build: Increase strictness of copy-trilium	2024-07-22 21:44:48 +03:00
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
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	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