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

471 commits

Author SHA1 Message Date
zadam 9ea91f821c update to electron 8 2020-02-03 22:23:23 +01:00
zadam 62a80ef016 standard widget => collapsible widget 2020-02-02 18:46:50 +01:00
zadam 513ce1a183 Merge branch 'master' into m41 
# Conflicts:
#	src/public/javascripts/services/sidebar.js
#	src/public/javascripts/services/tab_context.js
#	src/public/javascripts/services/tree.js
 2020-02-01 20:01:30 +01:00
zadam f6f7836b8e renamed notefull to notecomplement 2020-02-01 11:15:58 +01:00
zadam 7651c53363 release 0.40.2 2020-02-01 10:17:51 +01:00
zadam 05b51c0f68 frontend sync through websocket 2020-01-31 20:52:31 +01:00
zadam 439b45b0b8 refactored entity reloading 2020-01-29 20:14:02 +01:00
zadam 368d3b1b97 wip 2020-01-28 21:54:28 +01:00
zadam 865f7e1ee1 fix propagating note reloads 2020-01-27 20:07:33 +01:00
zadam 7d9b720ea8 fix note switching in current tab 2020-01-24 21:15:40 +01:00
zadam 4b66765cc1 refactoring 2020-01-24 15:44:24 +01:00
zadam 370c63986d converting more keyboard shortcuts 2020-01-22 19:41:19 +01:00
zadam c5eac8f438 keyboard handlers for tabs 2020-01-20 20:51:22 +01:00
zadam 8da094cd3c events for updating title (no saving yet) 2020-01-19 18:05:06 +01:00
zadam 44dc3c28de Merge branch 'master' into m41 2020-01-19 17:29:45 +01:00
zadam 828cce0d78 release 0.40.1 2020-01-19 15:45:06 +01:00
zadam 97b13ae91d refactroring WIP 2020-01-16 22:44:36 +01:00
zadam 209b1610f6 widgetizing tab pane 2020-01-15 19:40:17 +01:00
zadam a79a063d17 release 0.40.0-beta 2020-01-11 09:54:31 +01:00
zadam 5e91b1b5e0 package updates 2020-01-11 09:50:05 +01:00
zadam f3a2e2cbde Merge branch 'stable' 2020-01-08 21:39:17 +01:00
zadam 3cf3fc13b9 release 0.39.5 2020-01-08 21:01:24 +01:00
zadam 1cd2711097 Merge branch 'stable' 2020-01-05 20:02:19 +01:00
zadam f0dfe7d552 release 0.39.4 2020-01-04 22:01:20 +01:00
zadam fdb46f9329 fallback image saving without optimization will still compress image 2020-01-04 20:10:30 +01:00
zadam 94a0a31f17 refactoring of tree handling to recommended fancytree 2020-01-03 21:15:45 +01:00
zadam 7d877d0fef release 0.39.3 2020-01-02 10:43:41 +01:00
zadam 631a75deec release 0.39.2-beta 2019-12-30 19:48:54 +01:00
zadam 2502646a64 release 0.39.1-beta 2019-12-27 21:21:57 +01:00
zadam 0affcf5ad2 move electron-installer-debian to optional dependencies since it can't be installed on windows, #783 2019-12-26 10:02:55 +01:00
zadam 1ff124dab7 release 0.39.0-beta 2019-12-25 12:18:52 +01:00
zadam 6fc19bfb93 Merge branch 'stable' 2019-12-24 11:55:27 +01:00
zadam ccaa108faa release 0.38.3 2019-12-24 10:51:51 +01:00
zadam 0db3722ec2 package updates 2019-12-20 18:04:05 +01:00
zadam 6e4c30571c release 0.38.2 2019-12-18 20:21:06 +01:00
zadam b0a3f828fb release 0.38.1-beta 2019-12-10 23:09:02 +01:00
zadam 156f040880 added "backend log" dialog 2019-12-05 21:25:36 +01:00
zadam a890b91079 release 0.38.0-beta 2019-12-04 22:40:31 +01:00
zadam aa5ede5039 Merge branch 'stable' 2019-12-03 22:52:37 +01:00
zadam 21e77c83fc release 0.37.8 2019-12-03 22:31:20 +01:00
zadam 92d5f91aa6 Merge branch 'stable' 2019-12-03 20:33:42 +01:00
zadam a1402c7c66 release 0.37.7 2019-12-02 23:09:42 +01:00
zadam e58dc829f5 bootstrap 4.4.0 2019-11-27 18:59:42 +01:00
zadam 90d10c1ff3 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/tree_context_menu.js
#	src/services/import/enex.js
 2019-11-27 18:54:49 +01:00
zadam 5b30291601 release 0.37.6 2019-11-26 22:50:08 +01:00
zadam 5f258fbbbf release 0.37.5 2019-11-25 22:46:15 +01:00
zadam e4bec265c1 system links (internal, image, relation map) should follow camelCase convention used for other attributes 2019-11-23 20:54:49 +01:00
zadam 4da6234911 Merge branch 'stable' 2019-11-22 22:59:08 +01:00
zadam 38e7649ac3 release 0.37.4 2019-11-22 22:38:03 +01:00
zadam 0e5028acd3 support global shortcuts with global: prefix 2019-11-21 21:12:07 +01:00
zadam 00c295e4bf upgrade to electron 8.0.0-beta.3 2019-11-21 19:36:34 +01:00
zadam 08a518479b keyboard shortcuts options pane 2019-11-20 21:35:18 +01:00
zadam bcdfb47939 Merge branch 'stable' 2019-11-19 23:34:35 +01:00
zadam d357943ebb release 0.37.3 2019-11-19 23:05:54 +01:00
zadam 4bd7438fca shortcuts WIP 2019-11-19 20:53:04 +01:00
zadam f921562346 Merge branch 'm38' 
# Conflicts:
#	docs/backend_api/Note.html
#	docs/frontend_api/NoteShort.html
#	src/services/import/enex.js
 2019-11-18 23:26:29 +01:00
zadam c5acb7fc9b release 0.37.2 2019-11-18 23:04:09 +01:00
zadam 643d9077fc configurable keyboard shortcuts WIP 2019-11-18 23:01:31 +01:00
zadam b4709e8ee5 "distraction free mode" renamed to more standard "zen mode" 2019-11-18 19:32:27 +01:00
zadam a1262aaaf3 release 0.37.1-beta 2019-11-16 19:09:52 +01:00
zadam 95d0ad1cad simpler ENEX parsing 2019-11-16 18:13:00 +01:00
zadam 767aaa18f4 fix OPML import 2019-11-16 18:04:13 +01:00
zadam 8a7228146c simpler ENEX parsing 2019-11-16 17:56:49 +01:00
zadam 95c37cfdd1 release 0.37.0-beta 2019-11-14 23:12:28 +01:00
zadam e143becb7a styling changes 2019-11-14 20:27:28 +01:00
zadam 5b4a2bd71c Merge branch 'stable' 
# Conflicts:
#	src/entities/note.js
 2019-11-11 20:43:00 +01:00
zadam 1f3f9a4037 release 0.36.5 2019-11-10 22:20:54 +01:00
zadam 8f2d2b189c Merge branch 'stable' 2019-11-10 11:24:08 +01:00
zadam 5646218be8 release 0.36.4 2019-11-09 21:19:34 +01:00
zadam 712f67e983 uploading new image revisions, WIP 2019-11-08 22:34:30 +01:00
zadam d87c469fbb Merge branch 'stable' 2019-11-05 22:28:27 +01:00
zadam d8730f1722 release 0.36.3 2019-11-05 21:49:16 +01:00
zadam 5ecb881cec options template is handled directly in the option classes which fixes multiple binding of elements inside options dialog 2019-11-03 19:06:22 +01:00
zadam 2af86927b0 added flag for the erased notes 2019-11-01 22:09:51 +01:00
zadam f7c59700a5 release 0.36.2 2019-10-31 22:04:44 +01:00
zadam 1a182d1b58 final fix for the ws issue 2019-10-30 19:43:17 +01:00
zadam 4570319517 WS debugging messages and small changes 2019-10-24 23:02:29 +02:00
zadam ec7c0f0723 added sync mutex to ping messages 2019-10-22 21:59:51 +02:00
zadam 41d47c5d33 release 0.36.1-beta 2019-10-21 21:59:17 +02:00
zadam 358fd13c8d small refactorings 2019-10-20 13:09:00 +02:00
zadam 1903c59163 scripts should have different sourceId 2019-10-19 15:12:25 +02:00
zadam 6d5762fac8 open update to 7.0 2019-10-16 19:42:42 +02:00
zadam fda219d070 release 0.36.0-beta 2019-10-15 20:42:17 +02:00
zadam 22c4859d42 grey out archived items in the tree 2019-10-15 19:16:44 +02:00
zadam bcbbf4dc3e improvements to build process 2019-10-11 21:22:59 +02:00
zadam 7dc793920f fix spellcheck build on windows 2019-10-10 23:24:25 +02:00
zadam 0b43eceb2d Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2019-10-10 21:26:57 +02:00
zadam a15be82f00 release 0.35.2 2019-10-09 23:09:38 +02:00
zadam 0835930a8a fix creating child in relation map, closes #655 2019-10-09 23:04:01 +02:00
zadam a25260353d spellcheck binaries for linux-x64 2019-10-06 22:33:19 +02:00
zadam c1e8a4b384 spell check support + small options tabs reorganization 2019-10-06 21:35:26 +02:00
zadam dec2c218f7 basic book rendering of code and image notes 2019-10-02 19:40:22 +02:00
zadam 0ef6634d41 release 0.35.1 2019-09-30 22:18:23 +02:00
zadam f6fc24d11d use GFM extensions for markdown export, closes #638 2019-09-30 20:56:32 +02:00
zadam 42cf02e9a4 library updates 2019-09-30 19:35:00 +02:00
zadam 3add997b49 release 0.35.0-beta 2019-09-09 21:32:48 +02:00
zadam 76f3e87790 small fixes 2019-09-09 20:29:07 +02:00
zadam 3bf8546d51 added getOwnedAttribute() without attr inheritance which can speed up bulk operations significantly 2019-09-07 20:43:59 +02:00
zadam faae11f070 template attributes don't need isInheritable flag to take effect 2019-09-07 11:00:15 +02:00
zadam a17b8a053e refactoring of note loading 2019-09-04 22:13:22 +02:00
zadam 55356963dd improvements to similar notes - now using dice's coefficient for better results 2019-09-01 11:33:45 +02:00
zadam 4be7ac7ae1 export fixing links WIP 2019-08-31 10:12:42 +02:00
zadam de95b92f90 link map tweaks 2019-08-30 20:15:59 +02:00
zadam 84b1f1f24e text editor now support font size, color, background 2019-08-29 22:20:08 +02:00
zadam 650d9e0b27 state management fixes 2019-08-28 20:29:10 +02:00
zadam 48a654630f added checkboxes/todo lists and image resize, closes #264, #587 2019-08-27 19:50:57 +02:00
zadam 0558c30b56 updated to ckeditor 12.4.0 2019-08-26 20:34:50 +02:00
zadam 9622b046e0 refactored options_init to options on frontend 2019-08-25 17:36:13 +02:00
zadam fab4c59f9b using dynamic import for dialogs and widgets to speed up initial load 2019-08-20 21:40:47 +02:00
zadam 9888850c22 resizing sidebar in options 2019-08-19 23:02:19 +02:00
zadam f259c60b54 state is now applied to sidebar widgets 2019-08-16 21:29:44 +02:00
zadam 59da25ef55 sidebar & widget state management WIP 2019-08-15 10:04:03 +02:00
zadam 61520bc3b3 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2019-08-15 08:52:34 +02:00
zadam 5406b09f3a release 0.34.3 2019-08-13 21:48:56 +02:00
zadam 90f1bfb3e4 electron 6.0.2 2019-08-13 21:48:45 +02:00
zadam dfa1ab65c6 allow requiring native node modules from backend scripts 2019-08-12 20:41:38 +02:00
zadam 963ed32ce4 allow user to choose theme during initial setup 2019-08-11 10:28:49 +02:00
zadam 6e260ee563 Merge branch 'stable' 2019-08-06 19:28:11 +02:00
zadam b1075d956f release 0.34.2 2019-08-01 21:37:59 +02:00
zadam 6fe8bde720 package updates 2019-08-01 21:26:09 +02:00
zadam 7060700225 fix mobile tree not expanding automatically on load 2019-07-30 21:18:43 +02:00
zadam 385b79ad34 Merge remote-tracking branch 'origin/t35' 
# Conflicts:
#	src/views/tabs.ejs
 2019-07-28 22:38:02 +02:00
zadam b8509c487d release 0.34.1 2019-07-28 15:02:36 +02:00
zadam b488adc330 sidebar POC WIP 2019-07-24 22:52:51 +02:00
zadam b3834324f6 fix sync proxy with TLS 2019-07-24 20:47:41 +02:00
zadam b0c0c5f56b release 0.34.0-beta 2019-07-21 21:57:35 +02:00
zadam 97219aa12e removed unused clipper image API (migrated to clippings) 2019-07-18 22:35:16 +02:00
zadam 63b655cff4 package updates 2019-07-18 20:20:38 +02:00
zadam 706fc647ff Merge branch 'stable' 
# Conflicts:
#	package.json
 2019-07-11 22:27:27 +02:00
zadam 13e9f9f9e7 release 0.33.7 2019-07-11 20:55:56 +02:00
zadam b9373806cf fix doubling of extension 2019-07-11 20:40:40 +02:00
zadam 3d7a5f20e7 make it again possible to open notes through URL hash 2019-07-09 22:12:05 +02:00
zadam a912b2f23d choose port dynamically from range based on environment 2019-07-07 10:49:34 +02:00
zadam 976684a3a8 save note in clipper 2019-07-06 16:48:06 +02:00
zadam 7b1fdfabf8 upgrade ckeditor to 12.3.0 2019-07-04 19:53:10 +02:00
zadam 070e8d9647 Merge branch 'stable' 2019-07-03 20:51:34 +02:00
zadam 6d2394a9da release 0.33.6 2019-07-02 22:26:05 +02:00
zadam e94669de03 Merge branch 'stable' 2019-07-01 21:36:02 +02:00
zadam 9c91b0459e release 0.33.5 2019-06-30 21:47:04 +02:00
zadam ed380e09c9 context menu WIP 2019-06-30 18:56:46 +02:00
zadam b5daa83d69 upgrades + removal of unused test 2019-06-30 11:22:10 +02:00
zadam c8e4a5c9e7 release 0.33.4 2019-06-26 21:20:30 +02:00
zadam 7c77ae758b fix frontend reload again 2019-06-26 20:49:17 +02:00
zadam 20d3d61cec release 0.33.3 2019-06-24 20:47:50 +02:00
zadam d49cae9cea fix update of window title during note renaming 2019-06-24 20:12:04 +02:00
zadam 70591eadd5 release 0.33.2-beta 2019-06-20 09:39:11 +02:00
zadam fead3cd7ad fix note export/import/branch prefix to use right-clicked note as opposed to current active 2019-06-20 09:37:18 +02:00
zadam 5372f71faa hide menu bar 2019-06-19 20:45:19 +02:00
zadam 5c1922ac9f release 0.33.1-beta 2019-06-16 11:13:37 +02:00
zadam 44f592c6cb fix reload 2019-06-16 09:15:37 +02:00