gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-13 10:54:25 +01:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity
10,320 Commits 40 Branches 352 Tags
Commit Graph

259 Commits

Author SHA1 Message Date
Elian Doran
764d251b0a
server-ts: Port services/import/enex 2024-04-03 21:29:26 +03:00
Elian Doran
e96b56e061
server-ts: Fix build errors 2024-04-03 00:02:51 +03:00
Elian Doran
8c5f680dca
server-ts: Fix build errors 2024-02-25 15:06:43 +02:00
Elian Doran
7f0102181d
server-ts: Port services/import/single 2024-02-25 14:52:20 +02:00
Elian Doran
59d618f06b
server-ts: Port services/import/markdown 2024-02-25 08:12:07 +02:00
Elian Doran
cc1a545e13
server-ts: Port services/import/opml 2024-02-25 08:07:17 +02:00
Elian Doran
fd37fd3a45
server-ts: Port services/import/mime 2024-02-25 07:57:17 +02:00
Elian Doran
052a0a44f2
server-ts: Port services/import/utils 2024-02-25 07:54:51 +02:00
Elian Doran
fa0ed35752 server-ts: Port services/image 2024-02-20 23:29:03 +02:00
Elian Doran
0d4fb42731
server-ts: Port services/tree 2024-02-18 11:47:32 +02:00
Elian Doran
d8d729342d
server-ts: Port services/attributes 2024-02-18 11:26:05 +02:00
Elian Doran
de7f4de05b
server-ts: Port services/notes & hidden_subtree 2024-02-17 23:02:19 +02:00
Elian Doran
dc22d05657
server-ts: Port services/html_sanitizer 2024-02-17 21:33:47 +02:00
Elian Doran
45a6c9558f
server-ts: Fix references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran
030aec2f3e
server-ts: Fix more references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran
8b250e4a13
server-ts: Fix references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran
b63e870038
server-ts: protected_session.js -> ts 2024-02-17 13:32:41 +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
96b6d17d77
server-ts: Remove need for 'allowImportingTsExtensions' 2024-02-17 13:32:40 +02:00
Elian Doran
39627a4fc4
server-ts: log.js -> log.ts 2024-02-17 13:32:40 +02:00
zadam
ed00797179 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
 2023-11-27 10:41:07 +01:00
zadam
d07f02b95f contrary to what I believed encodeURIComponent() is available also in node.js, #4478 2023-11-27 10:15:29 +01:00
zadam
ad74952194 fix thumbnails with chinese titles, closes #4478 2023-11-27 10:10:27 +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
zadam
f37f47ce5b fixes to stable sorting 2023-11-03 01:11:47 +01:00
zadam
90c0a4a437 respect safeImport flag when sanitizing imported content 2023-10-21 17:54:07 +02:00
zadam
ba34df2e15 typo 2023-10-18 09:24:13 +02:00
zadam
9665e872c2 fix importing inline images within markdown within zip, closes #4301 2023-10-03 09:40:31 +02:00
zadam
9f726304aa sync fix, #4288 2023-09-28 00:24:53 +02:00
zadam
6c54c7d17d save enex images as attachment, fixes #4163 2023-08-15 10:25:23 +02:00
zadam
64b86b2666 use marked instead of commonmark to convert MD to HTML, which supports e.g. tables, closes #2026 2023-07-15 10:31:50 +02:00
zadam
d475346a09 renamed attachment's parentId to more fitting ownerId 2023-07-14 17:01:56 +02:00
zadam
ca41806bc2 import and export fixes 2023-07-13 23:54:47 +02:00
zadam
192e399cb5 typos 2023-06-30 11:18:34 +02:00
zadam
48029cea7c small refactorings 2023-06-29 22:10:13 +02:00
zadam
75c6afd1c3 fix loading of string content saved as binary 2023-06-14 22:21:22 +02:00
zadam
ff5d3a5f0c import WIP 2023-05-09 00:05:27 +02:00
zadam
f85209a72f getting rid of attributes like data-note-path in favor of the whole nav state in URLs 2023-05-07 21:18:21 +02:00
zadam
cc02546ed3 Merge remote-tracking branch 'origin/master' into next60 
# Conflicts:
#	src/routes/api/options.js
#	src/services/import/zip.js
#	src/services/options_init.js
 2023-05-07 09:41:33 +02:00
zadam
2aa987c072 fixes for zip export/import in regard to attachments 2023-05-06 22:50:28 +02:00
zadam
a06ddc439d improving import WIP 2023-05-06 15:07:38 +02:00
zadam
fa3cbb4645 grammar 2023-05-05 23:41:11 +02:00
zadam
6dfc72c065 many small fixes from Intellij analysis 2023-05-05 23:17:23 +02:00
contributor
386e8dd32e zip import - remove html tags added by Trilium 2023-05-04 19:56:02 +03:00
zadam
b6efc954bd blob WIP 2023-03-16 12:17:55 +01:00
zadam
eee05a4d01 blob WIP 2023-03-16 12:11:00 +01:00
zadam
dc97400dbf ancillary => attachment 2023-03-16 11:03:28 +01:00
zadam
e16bedfab4 WIP blobs 2023-03-16 11:02:07 +01:00
zadam
929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +01:00