zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 00:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
2303 commits 38 branches 306 tags 138 MiB
Commit graph

2303 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam c646019536 ignore electron error 2019-06-12 21:44:33 +02:00
zadam c8049f0efe small fixes 2019-06-12 19:59:52 +02:00
zadam f2c497049b node updated to 12, electron to 6 2019-06-11 21:56:21 +02:00
zadam d713274ae2 link map tweaks 2019-06-11 21:52:00 +02:00
zadam a72eeb9a98 check sync version before setting up the sync, fixes #559 2019-06-11 20:42:06 +02:00
zadam 41cdd5c640 npm updates 2019-06-10 23:00:50 +02:00
zadam 4cde65d171 close currently active dialog if a different one is activated 2019-06-10 22:45:03 +02:00
zadam 27659805f6 redesign of drag & drop, separation of active, focused and active notes in the tree, fixes #565 2019-06-10 21:47:08 +02:00
zadam 8ab081a3fd configuration of displayed link types + max number of links 2019-06-10 14:33:59 +02:00
zadam ccbb2e2e12 link map visual tweaks 2019-06-10 11:22:52 +02:00
zadam 2bf2ec5a6c link map WIP 2019-06-09 21:48:30 +02:00
zadam 4329675c60 dynamic display of link map 2019-06-09 19:18:14 +02:00
zadam 412b0377e9 added panzoom to link map 2019-06-09 11:50:11 +02:00
zadam 69e48ff4d7 fix links table reference 2019-06-09 11:16:00 +02:00
zadam 4cacd1dfa2 Merge branch 'stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
 2019-06-09 10:20:45 +02:00
zadam 0c8ad1b46e disable media embed in ckeditor, fixes #564 2019-06-09 09:58:25 +02:00
zadam d3ac7b0939 fix disappearing expander in some cases, closes #562 2019-06-07 22:37:10 +02:00
zadam e0306d4ad7 ckeditor upgraded to 12.2.0 2019-06-06 21:33:59 +02:00
zadam 1f3d726048 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
 2019-06-06 21:24:25 +02:00
zadam f3ed7e936d focus input on shown modal in branch prefix dialog, fixes #560 2019-06-06 21:16:12 +02:00
zadam 547ad7221d release 0.32.4 2019-06-05 22:53:34 +02:00
zadam 97a258c0c6 include sync version in sync seed request, #559 2019-06-05 22:50:03 +02:00
zadam 19a154c2f4 fix direct migration from 0.30 to 0.32, closes #557 2019-06-05 22:07:12 +02:00
zadam b389ec5ea3 enter/leave protected session button is not refreshed after entering from note detail (not dialog), fixes #555 
(cherry picked from commit 0a0663be69)
 2019-06-05 21:42:58 +02:00
zadam 412375e92f import should recognize all suported code note file types, fixes #554 2019-06-05 21:27:07 +02:00
zadam 4b96ada781 link map WIP 2019-06-04 22:57:10 +02:00
zadam 87b16f3325 link map WIP 2019-06-03 22:55:59 +02:00
zadam 0a0663be69 enter/leave protected session button is not refreshed after entering from note detail (not dialog), fixes #555 2019-06-03 20:36:37 +02:00
zadam 7eed076674 link router/loading 2019-06-02 17:12:18 +02:00
zadam b5143c152b link map empty dialog 2019-06-02 15:35:57 +02:00
zadam 6ef8a4c018 Merge branch 'next' 
# Conflicts:
#	package.json
 2019-06-02 15:22:15 +02:00
zadam ebd26f85bd release 0.32.3 2019-06-02 14:04:32 +02:00
zadam fbfb7b3b30 sync endpoints should not set csrf cookie, #541 2019-06-02 13:52:31 +02:00
zadam cfb313b60e sync endpoints should not set csrf cookie, #541 2019-06-02 13:47:59 +02:00
zadam 54e37dea20 codemirror updated to 5.47.0 2019-06-02 09:59:07 +02:00
zadam 5b14358620 fix folder status rendering issues when opening not-yet-loaded notes 2019-06-01 20:54:39 +02:00
zadam c4669cbaa3 fallback to display empty tab if the requested note doesn't exist anymore 2019-06-01 20:32:11 +02:00
zadam 74b41c9911 tree reloads should preserve activated node, fixes #552 2019-06-01 14:12:27 +02:00
zadam d08a36174d attribute sync should trigger note reload, fixes #551 2019-06-01 12:14:09 +02:00
zadam e845b80e10 fancytree upgrade to 2.31.0 2019-05-31 18:50:41 +02:00
zadam b0303ef529 updated sqlite binaries for electron 6 / node 12 2019-05-31 18:46:23 +02:00
zadam 68f67ec6ee package upgrades 2019-05-31 18:39:18 +02:00
zadam 20ae67f510 Merge branch 'master' into next 
# Conflicts:
#	package-lock.json
#	package.json
 2019-05-31 18:30:16 +02:00
zadam 237749e4af make recent notes dialog scrollable 2019-05-30 20:58:01 +02:00
zadam 15f4782947 make node activation after load clearer 2019-05-30 20:55:39 +02:00
zadam d48efd1925 FIXME 2019-05-29 23:34:23 +02:00
zadam 883d726622 release 0.32.2-beta 2019-05-29 23:14:59 +02:00
zadam 0a0cac5f41 added extra logging for debugging CSRF issues 2019-05-29 23:13:15 +02:00
zadam 012a18be00 put tabContext into frontend script API 2019-05-29 21:48:48 +02:00
zadam 890c00d4ba make frontendStartup event deterministic after the tree and tabs are loaded, fixes #543 2019-05-29 21:10:28 +02:00