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,929 Commits 38 Branches 306 Tags
Commit Graph

7929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
eca9459d4c
server: Use the TypeScript configuration that corresponds for Electron 2024-07-24 20:33:49 +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
MeIchthys
379c07a7fa
Update issue template to use new version scheme and TriliumNext Documentation links 2024-07-24 09:49:50 -04: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
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
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 +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
Nriver
935e882f3e translate 5 more dialogs and refine some translation 2024-07-23 17:38:22 +08: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