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

1511 Commits

Author SHA1 Message Date
zadam
2e55d544f1 db setup fixes 2020-03-26 16:59:40 +01:00
zadam
f9a79fa00f improvements and logging to local image storage 2020-03-25 21:01:42 +01:00
zadam
ef61e22f1f local image storage fixes 2020-03-25 18:21:55 +01:00
zadam
8a92786012 save paste images locally WIP 2020-03-25 11:28:44 +01:00
zadam
d927865cbd fix import zip corner case where there are 2 independent notes with the same name 2020-03-21 15:14:44 +01:00
zadam
438da7cfbb two pass import from zip file to guarantee that meta file is loaded before other files are process 2020-03-20 22:13:29 +01:00
zadam
af5c4b5859 zip import using yazl 2020-03-20 21:57:16 +01:00
zadam
04360381b6 reimplement export with yazl 2020-03-20 16:55:35 +01:00
zadam
45e2dc96fb export subtrees in ZIP instead of TAR format because of more widespread support (especially unicode) 2020-03-19 20:07:27 +01:00
zadam
789f12ac8f Merge remote-tracking branch 'origin/stable' 2020-03-19 09:44:00 +01:00
zadam
9a1a76605a fix OPML export of book notes, closes #919 2020-03-19 09:42:41 +01:00
zadam
141d4593ca fix loading of custom widgets 2020-03-16 23:25:52 +01:00
zadam
40247a591e fix delete shortcut in note tree and protect notes recursively 2020-03-15 22:09:48 +01:00
zadam
fcf72262bd Merge remote-tracking branch 'origin/stable' 2020-03-15 18:23:21 +01:00
zadam
a717ee00fb release 0.40.6 2020-03-15 11:21:43 +01:00
zadam
3bafc396fc fix consistency checks 2020-03-14 13:13:27 +01:00
zadam
08606f7d88 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/sync_table.js
 2020-03-14 12:58:47 +01:00
zadam
3fa3e912a4 not sending ping to clients after every sync addition, only after commit which significantly speeds up imports 2020-03-14 12:39:55 +01:00
zadam
44219e7ccc do not load the note content during ENEX import again since it's already available 2020-03-13 22:23:44 +01:00
zadam
48abd765c6 fix sync issues 2020-03-11 22:43:20 +01:00
zadam
e6e41adad0 fix backend to frontend sync with waitForSyncId() 2020-03-10 21:33:03 +01:00
zadam
bcbf1b79c3 fixed waitForSync 2020-03-09 22:32:26 +01:00
zadam
1d78432df4 Merge remote-tracking branch 'origin/stable' 2020-03-09 22:16:43 +01:00
zadam
c6d912dcb7 sync only changes with isSynced = true 2020-03-09 21:34:03 +01:00
zadam
eb287917c1 set sync.isSynced correctly 2020-03-09 21:28:41 +01:00
zadam
c67613a557 Merge remote-tracking branch 'origin/stable' 2020-03-09 21:00:38 +01:00
zadam
73bf2dcb02 added isSynced to sync table to allow forward compatibility with 0.41 2020-03-09 20:56:43 +01:00
zadam
719f10981e fix sync 2020-03-08 22:00:12 +01:00
zadam
1774f48d07 fix sync 2020-03-08 21:59:19 +01:00
zadam
deb67d6275 release 0.40.5 2020-03-08 21:05:52 +01:00
zadam
26599f057c collapsible widget remember their collapsed state 2020-03-01 20:49:11 +01:00
zadam
16f42dd4ab use electron 8 spellchecker instead of electron-spellchecker, WIP 2020-02-28 22:07:08 +01:00
zadam
7bcae9981b unified/simplified protecting notes & subtree 2020-02-26 16:37:17 +01:00
zadam
36eac6badd Merge remote-tracking branch 'origin/master' into m41 
# Conflicts:
#	src/public/javascripts/mobile.js
#	src/public/stylesheets/style.css
 2020-02-25 09:42:27 +01:00
zadam
e8a9e49e9e release 0.40.4 2020-02-24 22:59:22 +01:00
zadam
fb55cdaea6 release 0.40.4 2020-02-24 22:58:18 +01:00
zadam
fe31f08c0d show setup window if DB is not initialized 2020-02-19 22:09:49 +01:00
zadam
d9fb36a9a6 fixes 2020-02-19 22:09:02 +01:00
zadam
52f4876f2d camelCase keyboard action names 2020-02-19 20:54:14 +01:00
zadam
ad7a55d305 always autofix note_contents.content = NULL sync issue after note erasion 2020-02-19 19:51:36 +01:00
zadam
f2cf361acf small fixes 2020-02-17 22:38:46 +01:00
zadam
4330dc47a0 converted tree_keybindings.js into proper commands 2020-02-16 22:14:28 +01:00
zadam
7e41a2750c refactored KB handling and add link dialog 2020-02-15 22:12:05 +01:00
zadam
1d2fc773c2 fix for delete note sync etc. 2020-02-10 20:57:56 +01:00
zadam
4401a8e1e8 Merge branch 'master' into m41 
# Conflicts:
#	src/public/javascripts/dialogs/add_link.js
#	src/public/javascripts/dialogs/export.js
#	src/public/javascripts/dialogs/import.js
#	src/public/javascripts/dialogs/note_info.js
#	src/public/javascripts/services/search_notes.js
 2020-02-09 18:54:56 +01:00
zadam
4ce4ac9584 release 0.40.3 2020-02-09 10:48:23 +01:00
zadam
88bd65c679 external links are also parsed and label is created for them, closes #851 2020-02-09 10:45:07 +01:00
zadam
42017fde5f refactored access to options on frontend 2020-02-05 22:08:45 +01:00
zadam
0cc013c13f left sidebar can now be also collapsible 2020-02-04 20:42:40 +01:00
zadam
44ddcdd852 various widget optimizations for faster note switching 2020-02-03 21:16:33 +01:00