gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,765 Commits 38 Branches 306 Tags
Commit Graph

6083 Commits

Author SHA1 Message Date
Elian Doran
bd6ef06732
Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-23 23:43: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
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
3dbf8fb1c1 build: Fix running webpack on ESM 2024-07-23 00:12:08 +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
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
d09578735e
build: Implement cross-platform build info script 2024-07-21 11:45:31 +03:00
Elian Doran
af726eff6c
server: Update jsdom 2024-07-20 19:06:55 +03:00
Elian Doran
e284ea945c
i18n: Improve formatting 2024-07-20 11:42:54 +03:00
Elian Doran
288e677495
i18n: Change back to English 2024-07-20 10:37:28 +03:00
Elian Doran
5ea35dd851
i18n: Implement HTTP backend loader 2024-07-20 10:19:11 +03:00
Elian Doran
d4bf162e92
i18n: Add i18next-http-backend to library loader 2024-07-20 10:07:10 +03:00
Elian Doran
d14cf7c246
i18n: Move translations to backend serve 2024-07-20 10:02:25 +03:00
Elian Doran
784891409f
i18n: Add Romanian as demo 2024-07-20 09:51:09 +03:00
Elian Doran
0dbe6702ff
i18n: Translate about page 2024-07-20 09:42:55 +03:00
Elian Doran
10ec7d6b2b
i18n: Set up client dependency to i18next 2024-07-20 09:32:56 +03:00
Elian Doran
33a26b0b70
Merge pull request #212 from TriliumNext/bugfix/sync_failure 
Sync failed: Cannot read properties of undefined (reading 'utcDateChanged')
 2024-07-19 19:33:42 +03:00
Elian Doran
ab23459299
server: Fix script execution error (closes #244) 2024-07-19 19:30:27 +03:00
Elian Doran
40363f6e8e
Merge pull request #225 from TriliumNext/feature/update_typescript 
Update TypeScript dependencies
 2024-07-19 19:12:13 +03:00
Elian Doran
a10cc7bf8b
server-esm: Fix missing becca 2024-07-19 00:49:56 +03:00
Elian Doran
1cd6670c55
server-esm: Fix circular dependency between sql and sql_init 2024-07-19 00:47:09 +03:00
Elian Doran
87fbd4bce8
server-esm: Fix cyclical dependency 2024-07-19 00:34:37 +03:00
Elian Doran
b6c5880484
server-esm: Fix use of __dirname 2024-07-19 00:18:35 +03:00
Elian Doran
27c296fa6c
server-esm: Fix marked import issue 2024-07-19 00:02:39 +03:00
Elian Doran
93a0782009
server-esm: Fix a few more straightforward imports 2024-07-18 23:48:14 +03:00
Elian Doran
508b5e3c69
server-esm: Handle more straightforward requires 2024-07-18 23:45:17 +03:00
Elian Doran
f137d38300
server-esm: Handle async client 2024-07-18 23:42:54 +03:00
Elian Doran
da0829245f
server-esm: Handle proxy agent 2024-07-18 23:40:32 +03:00
Elian Doran
0a7828b9ae
server-esm: Handle two more async imports 2024-07-18 23:39:04 +03:00
Elian Doran
86808c07bd
server-esm: Handle migrations asynchronously 2024-07-18 23:36:49 +03:00
Elian Doran
3852753a89
server-esm: Avoid passing async to express 2024-07-18 23:36:26 +03:00
Elian Doran
fe385bf2e4
server-esm: Solve a few straightforward cases 2024-07-18 23:35:13 +03:00
Elian Doran
013f25a49b
server-esm: Make crash async 2024-07-18 23:26:21 +03:00
Elian Doran
8a30663d1e
server-esm: Start with some fundamental imports 2024-07-18 23:24:36 +03:00
Elian Doran
4f018c8ceb
server-esm: Fix one more service import 2024-07-18 23:15:01 +03:00
Elian Doran
bf29b30004
server-esm: Fix some more service imports 2024-07-18 23:06:08 +03:00
Elian Doran
c5561530ec
server-esm: Fix import to session-file-store 2024-07-18 22:59:39 +03:00
Elian Doran
f4d19e2bc1
server-esm: Solve some more imports 2024-07-18 22:58:12 +03:00
Elian Doran
4ed88d28e9
server-esm: Fix type errors related to cloning 2024-07-18 22:41:58 +03:00
Elian Doran
8ac8f6c2df
server-esm: Fix a few more import issues 2024-07-18 22:33:36 +03:00
Elian Doran
ad93fe4b75
server-esm: Remove dynamic imports due to past circular issues 2024-07-18 22:30:16 +03:00
Elian Doran
efdae79c10
server-esm: Remove two more straightforward imports 2024-07-18 22:25:03 +03:00
Elian Doran
a8fd3be133
server-esm: Remove dynamic import to utils 2024-07-18 22:21:33 +03:00