Commit Graph

7765 Commits (48cf41b5a5408c6ec4f8cc183ba1bca7fee31e1c)
 

Author SHA1 Message Date
Elian Doran 48cf41b5a5
Merge pull request #243 from TriliumNext/feature/server_esm_part3
Server ESM port: Getting things to run
2024-07-27 15:20:52 +07:00
Elian Doran 7b2d70ba56
Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-27 15:20:39 +07:00
Elian Doran 1a5649e8ac
Merge pull request #259 from TriliumNext/feature/server_esm
Server ESM port: Basic imports
2024-07-27 15:19:44 +07:00
Elian Doran b508b5bbfd
Update SECURITY.md 2024-07-25 00:31:42 +07:00
Elian Doran dc48eeb7c1
dev: Set up default JSON formatter on VS Code 2024-07-25 00:30:51 +07:00
Elian Doran 25db092b41
electron: Fix crash due to missing i18next 2024-07-24 21:04:20 +07:00
MeIchthys 379c07a7fa
Update issue template to use new version scheme and TriliumNext Documentation links 2024-07-24 09:49:50 +07:00
Elian Doran f382d3c728
Merge remote-tracking branch 'origin/feature/update_bettersqlite3' into feature/server_esm_part3 2024-07-24 00:02:15 +07:00
Elian Doran fd1f43d192
Merge remote-tracking branch 'origin/feature/update_electron' into feature/server_esm_part3 2024-07-24 00:01:44 +07:00
Elian Doran 989462c1b8
electron: Fix Common.js import 2024-07-24 00:00:41 +07:00
Elian Doran bd6ef06732
Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-23 23:43:00 +07:00
Elian Doran b9a2be6808
Merge pull request #248 from TriliumNext/feature/i18n_first_steps
i18n: First steps
2024-07-23 23:27:45 +07:00
Elian Doran ece343ac09
dev: Improve custom translation framework slightly 2024-07-23 23:27:00 +07: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 +07:00
Elian Doran de342c3285
dev: Set up key style & source language 2024-07-23 23:19:11 +07:00
Elian Doran 906dad62a8
dev: Set up i18n-ally 2024-07-23 22:52:34 +07:00
Elian Doran 0606fe01f6
Merge pull request #242 from TriliumNext/feature/server_esm_part2
Server ESM port: Convert some of the asynchronous imports
2024-07-23 19:17:20 +07:00
Elian Doran 1b5b3e697e
Merge branch 'feature/server_esm_part2' into feature/server_esm_part3 2024-07-23 19:15:59 +07:00
Elian Doran 3aa38b998a
server: Address requested changes 2024-07-23 19:14:33 +07:00
Elian Doran 45bf75b864
Merge branch 'feature/server_esm' into feature/server_esm_part2 2024-07-23 19:08:46 +07:00
Elian Doran 7f2caa00cb
test: Remove commented-out code 2024-07-23 19:07:39 +07:00
Elian Doran e9e329c6dd build: Fix Windows installer build 2024-07-23 00:26:02 +07:00
Elian Doran faa9ebe1bc build: Remove unnecessary rm 2024-07-23 00:24:27 +07:00
Elian Doran 26efa9299e build: Fix export = 2024-07-23 00:17:20 +07:00
Elian Doran 3dbf8fb1c1 build: Fix running webpack on ESM 2024-07-23 00:12:08 +07:00
Elian Doran 6f6ce38538 build: Increase strictness of copy-trilium 2024-07-22 21:44:48 +07:00
Elian Doran e74eff75db Revert "build: Export correct build info"
This reverts commit ef4f0f80b9.
2024-07-22 21:43:55 +07:00
Elian Doran 7fb4a66127 build: Remove redundant rm 2024-07-22 21:39:36 +07:00
Elian Doran ef4f0f80b9 build: Export correct build info 2024-07-22 21:35:24 +07:00
Elian Doran dd14ba9e0e build: Increase error strictness 2024-07-22 21:33:07 +07:00
Elian Doran c39d131426 ci: Add ESM change to main temporarily 2024-07-22 21:23:06 +07:00
Elian Doran b0d6564a63 server: Fix share not working after ESM port 2024-07-22 21:17:43 +07:00
Elian Doran c20c8d1176 server: Fix init database not working due to share db 2024-07-22 21:17:27 +07:00
Elian Doran 10239d1a0b Merge branch 'feature/server_esm_part2' into feature/server_esm_part3 2024-07-22 20:20:34 +07:00
Elian Doran f0a561565e Merge branch 'feature/server_esm' into feature/server_esm_part2 2024-07-22 20:15:49 +07:00
Elian Doran e53b7dd297 Merge remote-tracking branch 'origin/develop' into feature/server_esm 2024-07-22 19:59:44 +07:00
Elian Doran 997da1c3bc client: Change URL for checking updates (not testable yet) 2024-07-22 19:40:00 +07:00
Elian Doran c1b5eb086b ci: Don't build main if only docs were changed 2024-07-22 19:39:15 +07:00
Elian Doran 043313c71a Merge branch 'feature/update_electron' into feature/update_bettersqlite3 2024-07-21 23:29:48 +07:00
Elian Doran 62804ec67a Merge remote-tracking branch 'origin/develop' into feature/update_electron 2024-07-21 23:28:03 +07: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 +07:00
Elian Doran 2e9a624bfd
release 0.90.1-beta 2024-07-21 13:25:01 +07:00
Elian Doran 715a952148
build: Remove auth if token not provided 2024-07-21 13:24:44 +07:00
Elian Doran d09578735e
build: Implement cross-platform build info script 2024-07-21 11:45:31 +07:00
Elian Doran 374a51b77c
ci: Update build info for Windows setup as well 2024-07-21 11:26:14 +07:00
Elian Doran 5a8442f3d8
build: Fix artifacts not generated due to name change 2024-07-21 10:57:43 +07:00
Elian Doran f07a6600c9
ci: Patch package.json main 2024-07-21 09:12:46 +07:00
Elian Doran b2f688a3e5
ci: Fix typo 2024-07-21 08:53:21 +07:00
Elian Doran 4a7c447528
Merge pull request #255 from TriliumNext/feature/windows_installer
Windows installer
2024-07-21 08:52:06 +07:00
Elian Doran 028565d89b
ci: Fix dev workflow no longer triggering 2024-07-21 08:48:54 +07:00