gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,702 Commits 38 Branches 306 Tags
Commit Graph

1259 Commits

Author SHA1 Message Date
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
af726eff6c
server: Update jsdom 2024-07-20 19:06:55 +03:00
Elian Doran
b6c5880484
server-esm: Fix use of __dirname 2024-07-19 00:18:35 +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
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
1dc894e279
server-esm: Fix the remaining compilation errors 2024-07-18 21:56:20 +03:00
Elian Doran
6c8e9f69b0
server-esm: Fix import of package.json 2024-07-18 21:53:50 +03:00
Elian Doran
ecb8a7f394
server-esm: Change single export to export default 2024-07-18 21:50:12 +03:00
Elian Doran
0ceae0a65e
server-esm: Change some more export object to export default object 2024-07-18 21:47:30 +03:00
Elian Doran
55eecb0f61
server-esm: Change export object to export default object 2024-07-18 21:42:44 +03:00
Elian Doran
2750df04a3
server-esm: Change simple library import statements 2024-07-18 21:37:45 +03:00
Elian Doran
35d11cc0d2
server-esm: Change simple local import statements 2024-07-18 21:35:17 +03:00
Elian Doran
8fb67c9766
server-esm: Normalize quotes in require imports 2024-07-18 21:28:51 +03:00
Elian Doran
8b79975500
server: Fix SVG backwards compatibility (fixes #238) 2024-07-18 19:29:34 +03:00
Elian Doran
ea1da1e155
server: Fix rendering of SVG attachments (closes #226) 2024-07-16 22:29:00 +03:00
Elian Doran
d5c1bd1085
Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7 
; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts
 2024-07-13 18:36:04 +03:00
zadam
a2711cfb7b verify that the uploaded modified file is temporary 2024-05-18 05:50:46 +02:00
Elian Doran
a68b75f069
Merge pull request #48 from TriliumNext/feature/typescript_backend_11 
Convert backend to TypeScript (89% -> 92%, final)
 2024-04-20 09:37:19 +03:00
Elian Doran
2771bd4ece
Merge pull request #47 from TriliumNext/feature/typescript_backend_10 
Convert backend to TypeScript (84% -> 89%)
 2024-04-20 09:36:08 +03:00
Elian Doran
19cf9df52c
Merge pull request #45 from TriliumNext/feature/typescript_backend_9 
Convert backend to TypeScript (81% -> 84%)
 2024-04-20 09:35:18 +03:00
Elian Doran
0d700d6951
server-ts: Address review 2024-04-17 23:00:02 +03:00
Elian Doran
625d935f08
Merge pull request #44 from TriliumNext/feature/typescript_backend_8 
Convert backend to TypeScript (80% -> 81%)
 2024-04-16 21:01:20 +03:00
Elian Doran
1372cc1cb9
server-ts: Fix regression 2024-04-15 21:20:59 +03:00
Elian Doran
dededcd303
server-ts: Port routes/routes 2024-04-11 23:00:24 +03:00
Elian Doran
c08393f04b
server-ts: Port share/routes 2024-04-10 19:04:38 +03:00
Elian Doran
39e152b0b9
Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_10 2024-04-09 21:46:24 +03:00
Elian Doran
2a99ecc384
Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_9 2024-04-09 21:45:40 +03:00
Elian Doran
22477f90ae
Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_8 2024-04-09 21:45:04 +03:00
Elian Doran
d8c2ba0ed8
Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_7 2024-04-09 21:44:26 +03:00
Elian Doran
74441273a8
server-ts: Fix getAttribute permitting null 2024-04-09 21:43:42 +03:00
Elian Doran
9b9b452055
server-ts: Convert etapi/spec 2024-04-07 18:18:26 +03:00
Elian Doran
5fdf094e9d
server-ts: Convert etapi/notes 2024-04-07 16:56:45 +03:00
Elian Doran
e4024408bd
server-ts: Convert etapi/bbranches 2024-04-07 15:21:42 +03:00
Elian Doran
071f9400d7
server-ts: Convert etapi/auth 2024-04-07 15:17:45 +03:00
Elian Doran
a6de065bf4
server-ts: Convert etapi/attachments 2024-04-07 15:13:34 +03:00
Elian Doran
10c21d3403
server-ts: Convert routes/index 2024-04-07 14:36:47 +03:00
Elian Doran
a18b054dbb
server-ts: Convert routes/setup 2024-04-07 14:33:41 +03:00
Elian Doran
2e906af77d
server-ts: Convert routes/session_parser 2024-04-07 14:32:08 +03:00
Elian Doran
34cd2eba91
server-ts: Remove use of (req as any) 2024-04-07 14:29:08 +03:00
Elian Doran
7fe6d1ab4d
server-ts: Convert routes/login 2024-04-07 14:22:01 +03:00
Elian Doran
c2eefad287
server-ts: Convert routes/error_handlers 2024-04-07 14:13:57 +03:00
Elian Doran
202fda3c30
server-ts: Convert routes/electron 2024-04-07 14:09:37 +03:00
Elian Doran
4940207b15
server-ts: Convert routes/custom 2024-04-07 14:05:50 +03:00
Elian Doran
79c9d7e305
server-ts: Convert routes/assets 2024-04-07 14:02:52 +03:00
Elian Doran
6e042c20e9
server-ts: Convert routes/api/tree 2024-04-06 23:34:47 +03:00