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

136 Commits

Author SHA1 Message Date
zadam
b906efb23b fix ZIP import without metadata 2022-12-25 14:10:12 +01:00
zadam
392b89e6dd exported links to "named" notes should be preserved upon import 2022-12-23 23:08:30 +01:00
zadam
698eb53006 small fixes 2022-12-23 14:18:40 +01:00
zadam
4cc9bdf5e4 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2022-12-22 18:16:06 +01:00
zadam
1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +01:00
zadam
6c431ae5ed fix enex import splitting image/resource into multiple chunks, closes #3424 2022-12-15 14:14:21 +01:00
zadam
653f80f7d8 WIP 2022-12-07 23:37:40 +01:00
zadam
b9632a7814 rename note types to camelCase 2022-12-06 23:01:42 +01:00
Sylvain Pasche
fc69f3b8f3 let import continue when malformed URLs are encountered 
In case of malformed URLs in imported HTML, keep original URL instead
of having the import get stuck.
 2022-09-18 18:18:42 +02:00
zadam
12b3302687 sanitize note title && attrs just to be sure 2022-07-06 23:09:16 +02:00
zadam
dad82ea4e8 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/services/build.js
 2021-12-31 20:16:31 +01:00
zadam
6bc8773d5f handle OPML with empty content, fixes #2495 2021-12-30 21:06:45 +01:00
zadam
b8fe9a41db fix consistency checks 2021-12-27 13:37:51 +01:00
zadam
f56123b864 fix missing branch in case of out-of-order clones, closes #2464 2021-12-26 23:31:54 +01:00
zadam
074eb1c02f importing of cloned notes should not depend on ZIP listing order, fixes #2440 2021-12-15 22:36:45 +01:00
zadam
3413074235 when saving Saved Search or SQL console, move it to their home (i.e. remove from hidden subtree) 2021-10-24 14:53:45 +02:00
zadam
ba676587df fix importing notePosition of directories 2021-10-08 22:31:35 +02:00
Ben Jackson
14f24c646a
enex: Convert OneNote (via Evernote) todo images to Unicode checkboxes (#2189) 
When a OneNote todo bullet is imported by Evernote it is converted to an
image showing the checkbox the way it looked in OneNote. This change
takes advantage of the consistency of that image hashing to convert
those images into unicode checkboxes (matching the existing ENEX
<en-todo> behavior) . It also removes the image attachments.
 2021-09-29 18:11:04 +02:00
zadam
5cfd1c030d allow specifiyng sorted attribute (including off for overriding), #2142 2021-09-03 22:33:40 +02:00
zadam
b660238a40 backend import unification 2021-06-29 22:15:57 +02:00
zadam
205f9953f9 Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-26 21:27:06 +02:00
zadam
b9639bffce imported internal links crash ckeditor, #1979 2021-05-25 21:45:59 +02:00
zadam
439ef4a8cb moved becca to top level source dir 2021-05-17 22:09:49 +02:00
zadam
e257634ccf becca conversion WIP 2021-05-02 22:47:57 +02:00
zadam
3091119893 becca conversion WIP 2021-05-02 21:34:57 +02:00
zadam
1af10d48a2 becca conversion WIP 2021-05-02 11:23:58 +02:00
zadam
a88a32acae support OPML from MindManager, fixes #1862 2021-04-19 22:33:58 +02:00
MatAsmania
1dfebdf6db
Fix for Evernote workaround and support for en-todo (#1827) 2021-04-07 22:48:49 +02:00
zadam
4aa27b6033 added "sort by" dialog 2021-02-28 23:40:15 +01:00
zadam
d905335935 correct placement of imported root note (at the end) 2021-02-16 23:38:05 +01:00
zadam
3f2e8717b3 sanitize also clipper content, #1532 2021-01-14 21:52:44 +01:00
zadam
b7b1324dd0 fixed disabled prefix in case of unsafe import to conform to new attribute name pattern constraints 2020-12-04 22:05:29 +01:00
zadam
8ec476ba96 fix ENEX import note saving 2020-11-19 13:30:39 +01:00
zadam
fd6b2f1e7f enex import cleanup 2020-11-18 21:30:56 +01:00
zadam
6662b9dbf9 rate limiting to improve responsiveness during / after import 2020-11-17 23:05:05 +01:00
zadam
c0a29ede05 small fixes to ENEX import 2020-11-17 22:35:20 +01:00
zadam
9e97fdcc49 convert H1 to H2 also during import 2020-11-01 20:38:39 +01:00
zadam
06a4eab7d5 improved detection of image notes in ENEX import, fixes #1348 2020-10-28 23:36:45 +01:00
zadam
c671b0a345 fix OPML import, closes #1333 2020-10-26 19:02:33 +01:00
zadam
d57a303251 fix in ENEX import 2020-09-16 20:32:20 +02:00
zadam
055db32510 removed tar import 2020-07-09 21:46:33 +02:00
zadam
3e189d5c10 fixes 2020-07-01 23:50:33 +02:00
zadam
5e18e7dc67 html sanitize imported notes, #1137 2020-06-30 23:37:06 +02:00
zadam
51f094f87f image handling consistency fixes 2020-06-28 23:10:45 +02:00
zadam
c778e87683 wip 2020-06-27 00:40:35 +02:00
zadam
a574fce13f Merge remote-tracking branch 'origin/stable' into syncification 
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js
 2020-06-24 22:08:31 +02:00
zadam
238df0fb40 fix SVG single file import as image and not as file, closes #1114 2020-06-24 21:47:50 +02:00
zadam
969f31dde2 fixed backup and anonymization with better-sqlite3 2020-06-20 23:09:34 +02:00
zadam
027afab6b1 fix DB setup 2020-06-20 21:42:41 +02:00
zadam
88348c560c syncification 2020-06-20 12:31:38 +02:00