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

643 Commits

Author SHA1 Message Date
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
82a437f2a8 remove unnecessary debounce which caused missed changes 2024-05-30 06:55:45 +02:00
zadam
a2711cfb7b verify that the uploaded modified file is temporary 2024-05-18 05:50:46 +02:00
Elian Doran
ae29699e65
server-ts: Port www 2024-04-11 23:14:37 +03:00
Elian Doran
9022bc338a
server-ts: Port app 2024-04-11 23:03:19 +03:00
Elian Doran
c08393f04b
server-ts: Port share/routes 2024-04-10 19:04:38 +03:00
Elian Doran
b8eb301f34
server-ts: Add types for multer 2024-04-07 14:38:51 +03:00
Elian Doran
10c21d3403
server-ts: Convert routes/index 2024-04-07 14:36:47 +03:00
Elian Doran
2e906af77d
server-ts: Convert routes/session_parser 2024-04-07 14:32:08 +03:00
Elian Doran
0ab137de03
server-ts: Convert routes/api/files 2024-04-05 22:22:18 +03:00
Elian Doran
764d251b0a
server-ts: Port services/import/enex 2024-04-03 21:29:26 +03:00
Elian Doran
0daa4cc89a
Merge branch 'feature/typescript_backend_3' into feature/typescript_backend_4 2024-04-02 23:57:01 +03:00
Elian Doran
db2b33704f
Merge branch 'feature/typescript_backend' into feature/typescript_backend_2 2024-03-30 10:54:06 +02:00
Elian Doran
3eb7ed5dda
server-ts: Address requested changes 2024-03-30 10:49:40 +02:00
Elian Doran
926b3e9650
Merge remote-tracking branch 'origin/develop' into feature/typescript_backend 2024-03-17 21:44:06 +02:00
zadam
bfb8aa6481 remove eslint 2024-03-06 07:17:51 +01:00
zadam
2bb4cccd82 fix excalidraw 0.17 integration 2024-03-06 07:13:30 +01:00
zadam
80eaf10656 remove husky 2024-03-06 06:51:25 +01:00
zadam
6f1e6402f0 package upgrades + removal of prettier 2024-03-06 06:47:30 +01:00
Elian Doran
cc1a545e13
server-ts: Port services/import/opml 2024-02-25 08:07:17 +02:00
Elian Doran
29d37c40c1 server-ts: Port services/export/zip 2024-02-19 23:08:43 +02:00
Elian Doran
1728365fa1 server-ts: Port services/export/single 2024-02-19 22:12:00 +02:00
Elian Doran
ec4bd6659a server-ts: Port services/export/md 2024-02-19 21:59:40 +02:00
Elian Doran
dc22d05657
server-ts: Port services/html_sanitizer 2024-02-17 21:33:47 +02:00
Elian Doran
748a551def
server-ts: Port similarity 2024-02-17 20:55:36 +02:00
Elian Doran
6f0659c03c
server-ts: Bring back nodemon 2024-02-17 13:32:43 +02:00
Elian Doran
cf18e61a33
server-ts: Port ws service & dependencies 2024-02-17 13:32:42 +02:00
Elian Doran
82a9808dea
server-ts: sql.js -> sql.ts 2024-02-17 13:32:41 +02:00
Elian Doran
7a9365457a
server-ts: utils.js -> utils.ts 2024-02-17 13:32:41 +02:00
Elian Doran
bda11fad40
server-ts: Fix errors in log.ts 2024-02-17 13:32:40 +02:00
Elian Doran
094895ec72
server-ts: Enable ts-node instead of nodemon 2024-02-17 13:32:40 +02:00
zadam
ebd6276b5e CKEditor 41.0.0 2024-01-27 23:02:11 +01:00
zadam
17e063f01d updates 2024-01-12 00:02:45 +01:00
zadam
2c7b774356 Merge branch 'stable' 2024-01-10 22:57:05 +01:00
zadam
cd43752f61 remove conflicting shortcut, fixes #4570 2024-01-09 22:52:13 +01:00
zadam
0404b78fb8 fix loading katex in share #4558 2024-01-07 22:52:16 +01:00
zadam
33af9a3595 updates 2023-12-27 22:48:16 +01:00
zadam
df85a5eee4 Merge branch 'stable' 
# Conflicts:
#	src/routes/api/revisions.js
#	src/services/bulk_actions.js
 2023-12-11 23:07:15 +01:00
zadam
2e23c521c3 electron upgrade 2023-12-06 23:54:17 +01:00
zadam
947627d8a0 relation map deprecation - don't show it in menu to create new note 2023-11-27 10:50:17 +01:00
zadam
ad74952194 fix thumbnails with chinese titles, closes #4478 2023-11-27 10:10:27 +01:00
zadam
1f206a9c24 load panzoom from node_modules 2023-11-22 20:28:17 +01:00
zadam
f026646bb5 load split.js from node_modules 2023-11-22 20:26:20 +01:00
zadam
f9bfc8ad86 load printThis from node_modules 2023-11-22 20:22:16 +01:00
zadam
e70539ff48 load jquery-hotkeys from node_modules 2023-11-22 20:15:21 +01:00
zadam
a439be79b3 load jquery from node_modules 2023-11-22 20:11:41 +01:00
zadam
edf2dfe8f9 load mermaid from node_modules 2023-11-22 20:09:04 +01:00
zadam
0e4c49ea5b load box icons from node_modules 2023-11-22 20:06:44 +01:00
zadam
52cfd138d1 load force-graph from node_modules 2023-11-22 20:02:35 +01:00
zadam
cf99345962 use .js extension for require() as a preparation for future migration to ESM 2023-11-22 19:34:48 +01:00