gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
8,128 Commits 41 Branches 349 Tags
Commit Graph

6303 Commits

Author SHA1 Message Date
Elian Doran
7fb3abb4ea
electron: Fix directory imports 2024-07-24 20:41:44 +03:00
Elian Doran
bb19cc216b
server: Fix shadowed fields in becca entities 2024-07-24 20:40:03 +03:00
Elian Doran
709101c540
server: Fix some build errors 2024-07-24 20:35:19 +03:00
Elian Doran
24af2e55dc
server: Fix the remainder of import issues 2024-07-24 20:33:35 +03:00
Elian Doran
42f0073ab6
server: Fix various imports 2024-07-24 20:31:26 +03:00
Elian Doran
20ee62dfb1
server: Fix search-related imports 2024-07-24 20:30:12 +03:00
Elian Doran
2787feb593
server: Fix missing .js import for blob_interface 2024-07-24 20:27:50 +03:00
Elian Doran
8a5dca5dca
server: Fix missing .js import for becca 2024-07-24 20:26:57 +03:00
Elian Doran
d5ec62f797
server: Fix missing .js import for shaca 2024-07-24 20:25:38 +03:00
Elian Doran
3595ace249
server: Fix missing .js import for request_interface 2024-07-24 20:24:47 +03:00
Elian Doran
ed0970b33b
server: Fix missing .js import for entity_changes_interface 2024-07-24 20:24:13 +03:00
Elian Doran
ed0d86c787
server: Fix missing .js import for note-interface 2024-07-24 20:23:34 +03:00
Elian Doran
212d61c1d2
server: Fix missing .js import for route-interface 2024-07-24 20:23:05 +03:00
Elian Doran
3067380338
server: Fix missing .js import for etapi-interface 2024-07-24 20:21:52 +03:00
Elian Doran
76fcea7189
server: Fix missing .js import for rows file 2024-07-24 20:20:20 +03:00
Nriver
a8d6e5b1ea add translation for 6 more dialogs 2024-07-24 17:34:26 +08:00
Nriver
5691554442 add translation for enter 2024-07-24 17:32:01 +08:00
Nriver
a01065908d Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-07-24 09:17:51 +08: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
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
Nriver
935e882f3e translate 5 more dialogs and refine some translation 2024-07-23 17:38:22 +08: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
Nriver
cb9b4c07e5 translate some dialogs 2024-07-22 17:31:54 +08: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