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

2428 commits

Author SHA1 Message Date
zadam e7aa84435b render PDF preview in electron for pdf notes 2020-03-08 18:06:24 +01:00
zadam 493d088d80 better back/forward navigation 2020-03-08 17:17:18 +01:00
zadam 5f4d963580 better back/forward navigation WIP 2020-03-08 11:41:42 +01:00
zadam 5114f3f782 fixes after merge 2020-03-08 09:38:49 +01:00
zadam 53f5df4e88 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/public/stylesheets/style.css
#	src/views/details/image.ejs
#	src/views/details/relation_map.ejs
 2020-03-08 09:26:34 +01:00
zadam e4039ea5e1 fixed printing relation map 2020-03-08 09:24:03 +01:00
zadam 95fef8d2e5 fixes after merge 2020-03-07 22:29:49 +01:00
zadam 7105b61aab Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/views/desktop.ejs
#	src/views/mobile.ejs
 2020-03-07 22:21:55 +01:00
zadam 78a50be663 don't print control buttons 2020-03-07 22:18:12 +01:00
zadam 3d3ad3b99b include themes.css for printing to have default CSS variables available 2020-03-07 22:14:07 +01:00
zadam 0d9cdcac85 load appropriate styles for printing book notes, closes #899 2020-03-07 22:01:34 +01:00
zadam c4f7bb37db removed sidebar widget settings 2020-03-07 21:34:39 +01:00
zadam 81ec85083a link map widget always rendered centered map 2020-03-07 20:41:03 +01:00
zadam 62da383623 only one update 2020-03-07 15:01:48 +01:00
zadam 8513e0201c collapsed state is now synchronized across tab-cached instances 2020-03-07 14:31:25 +01:00
zadam abd60581be right pane is now scrollable 2020-03-07 14:18:58 +01:00
zadam aff02184f8 removed last tab should activate second to last 2020-03-07 13:57:31 +01:00
zadam 8909d175d0 event fixes 2020-03-07 13:40:46 +01:00
zadam 091eb8f791 event fixes WIP 2020-03-06 23:34:39 +01:00
zadam e10d23289e event fixes WIP 2020-03-06 22:17:07 +01:00
zadam 26599f057c collapsible widget remember their collapsed state 2020-03-01 20:49:11 +01:00
zadam 4e0e2e8926 fixes in side pane toggling 2020-03-01 20:11:40 +01:00
zadam 687539cc95 fix zen mode 2020-03-01 19:16:30 +01:00
zadam 03e0c98066 migrated desktop CSS to the desktop layout 2020-03-01 19:06:26 +01:00
zadam 77f358b846 migrated mobile CSS to the mobile layout 2020-03-01 18:57:13 +01:00
zadam 4c82e882e0 bit better right pane layout 2020-03-01 18:47:20 +01:00
zadam 0f4ba43463 mobile frontend is working again 2020-03-01 15:19:16 +01:00
zadam f15239c006 mobile layout fixes 2020-03-01 12:50:02 +01:00
zadam ed1b5e3843 mobile layout fixes 2020-03-01 12:05:10 +01:00
zadam 607bdfef92 mobile global buttons 2020-03-01 11:53:02 +01:00
zadam 4f744564f2 start of mobile layout 2020-03-01 11:04:42 +01:00
zadam f64b343d8d ref 2020-03-01 10:41:23 +01:00
zadam 47b803920b keep body hidden until rendered 2020-02-29 22:13:54 +01:00
zadam 8888d04878 fixes 2020-02-29 22:04:46 +01:00
zadam 49398f5374 refactoring of component event system + little docs 2020-02-29 19:43:19 +01:00
zadam 95d1952896 wip 2020-02-29 16:26:46 +01:00
zadam 3ab2b41e8c open links in new tab without activation 2020-02-29 15:00:35 +01:00
zadam e5155130e7 ckeditor with table/cell properties 2020-02-29 14:32:26 +01:00
zadam 724ba352e6 refactored existing context menus 2020-02-29 13:03:05 +01:00
zadam 1239293435 spell check context menu 2020-02-29 11:28:30 +01:00
zadam 16f42dd4ab use electron 8 spellchecker instead of electron-spellchecker, WIP 2020-02-28 22:07:08 +01:00
zadam 350331e2ef fix 500px constant height of relation maps, closes #882 2020-02-28 15:20:54 +01:00
zadam a2d6a5c3e9 fixes 2020-02-28 11:46:35 +01:00
zadam cb35284d37 wip 2020-02-28 00:31:12 +01:00
zadam 2af37640d8 small refactoring of search code 2020-02-28 00:11:34 +01:00
zadam 4bd298a55b refactor data-kb-command 2020-02-27 23:12:22 +01:00
zadam cd4b1235a7 wip 2020-02-27 14:35:12 +01:00
zadam 5e3c85f891 fix issues 2020-02-27 12:41:15 +01:00
zadam b2a3e1cc04 fixed double refresh of note detail 2020-02-27 12:26:42 +01:00
zadam d71763aedb title row spacing 2020-02-27 10:08:21 +01:00
zadam 368d0c55da refactoring of layout finished 2020-02-27 10:03:14 +01:00
zadam 637010577b layout changes WIP 2020-02-27 00:58:10 +01:00
zadam 7bcae9981b unified/simplified protecting notes & subtree 2020-02-26 16:37:17 +01:00
zadam 3752cf8cba layout fixes 2020-02-25 19:19:10 +01:00
zadam 7270bf287d fixes and right pane layout changes 2020-02-25 16:31:44 +01:00
zadam d821ea4095 fix closing all tabs except current 2020-02-25 12:32:21 +01:00
zadam 41d1d83dc2 fix showing/hiding of type widgets 2020-02-25 12:24:37 +01:00
zadam a2fe110400 unified global variable handling between mobile and desktop 2020-02-25 11:02:59 +01:00
zadam fdc99bb6f9 adapt merged changes from master 2020-02-25 10:47:49 +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 7cac2521ef fix css class handling 2020-02-25 09:40:49 +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 b9b2cc8364 make sure $rendered is always jquery object 2020-02-24 22:55:12 +01:00
zadam 8dfdd090f5 use note's css class also in book and included note, closes #879 2020-02-24 22:46:27 +01:00
zadam fe7705524a fix include note in mobile frontend, closes #878 2020-02-24 22:37:45 +01:00
zadam 2b1b7774f8 make images in text notes rendered responsively in a book, fixes #871 2020-02-19 22:24:31 +01:00
zadam 2d58019d6e allow to setup web version as a sync client 2020-02-19 22:10:40 +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 2e3534dfb7 small fixes 2020-02-18 22:16:20 +01:00
zadam d288c1b052 small fixes 2020-02-17 22:47:50 +01:00
zadam f2cf361acf small fixes 2020-02-17 22:38:46 +01:00
zadam e7af24c139 small fixes 2020-02-17 22:14:39 +01:00
zadam 9797942b8e small cleanups 2020-02-17 19:42:52 +01:00
zadam 32d60a7eb9 refactored tree context menu to reduce duplication 2020-02-16 22:56:40 +01:00
zadam 4330dc47a0 converted tree_keybindings.js into proper commands 2020-02-16 22:14:28 +01:00
zadam 8ca9ad3497 fixes 2020-02-16 20:09:59 +01:00
zadam a679fedb58 refactored keyboard actions into commands 2020-02-16 19:54:11 +01:00
zadam 880f4ad711 renamed Listener() to Event() 2020-02-16 19:23:49 +01:00
zadam e000fb4579 appContext is now component 2020-02-16 19:21:17 +01:00
zadam 22c042e21f remove appContext as copied dependency across components 2020-02-16 18:11:32 +01:00
zadam 2c3f07521d fixes 2020-02-16 11:22:37 +01:00
zadam e06f3ef97e refactorings for add link and include note 2020-02-16 10:50:48 +01:00
zadam 7e41a2750c refactored KB handling and add link dialog 2020-02-15 22:12:05 +01:00
zadam b2a48a1f3a fix clone notes dialog 2020-02-15 18:41:32 +01:00
zadam e1bf4dcbc9 basic executor / command mechanism 2020-02-15 10:41:21 +01:00
zadam 6d847d22d3 components now track their parent 2020-02-15 09:43:47 +01:00
zadam 9337564075 boxicons 2.0.5 2020-02-15 09:16:23 +01:00
zadam 2fa41b44c5 fix branch prefix dialog 2020-02-14 21:21:47 +01:00
zadam 8d2c2202fa refactoring and fixes for saved note 2020-02-14 20:18:09 +01:00
zadam 380bb0cd01 fix deleting 2020-02-12 22:25:52 +01:00
zadam 789f62267c changes in note detail handling 2020-02-12 22:09:25 +01:00
zadam 25553c9e67 simplification of sync event API 2020-02-12 20:31:31 +01:00
zadam 81a54cd4a0 messaging now uses mutex so each component processes only single message at each time 2020-02-12 20:07:04 +01:00
zadam 1d2fc773c2 fix for delete note sync etc. 2020-02-10 20:57:56 +01:00
zadam 7767edd82f fixes 2020-02-09 22:31:52 +01:00
zadam 99ea238c3f frontend sync fixes 2020-02-09 21:53:10 +01:00
zadam 826c434630 fixes in closing tabs and elsewhere 2020-02-09 21:13:05 +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 9eab3026bb display advanced item in the tree context menu in the middle to avoid being hidden, closes #853 2020-02-09 10:15:35 +01:00
zadam 7abaedbf31 add possibility to change clipper parent to a fixed note instead of day notes, fixes #854 2020-02-09 10:12:02 +01:00
zadam 402718d293 return focus to the previously focused element after closing the dialog, fixes #861 2020-02-09 10:00:13 +01:00
zadam 4ec671d199 fixes in enabling / disabling widgets in runtime 2020-02-08 21:54:39 +01:00
zadam 9f4a514562 fix setting path 2020-02-08 21:23:42 +01:00
zadam 18ee239362 fixes 2020-02-08 20:53:07 +01:00
zadam 08687b76ea fix title bar buttons visibility 2020-02-08 18:25:07 +01:00
zadam 60d07a6871 fix duplicated cached widgets 2020-02-08 17:44:34 +01:00
zadam 81f4966a1a fixes, cleaned up noise in the developer console 2020-02-08 10:40:58 +01:00
zadam 9acf723a9a fixes 2020-02-07 22:19:35 +01:00
zadam 47f7f5f4d9 refactoring 2020-02-07 21:43:02 +01:00
zadam 14d6372bd8 moved tab related stuff to tab manager from app context 2020-02-07 21:08:55 +01:00
zadam 6d912c4897 removed dependency on note tree widget from app context 2020-02-07 20:56:49 +01:00
zadam 62e1284790 untangled tabrow dependencies 2020-02-06 22:39:31 +01:00
zadam d79ae261e1 refactored layout out of app context 2020-02-06 21:47:31 +01:00
zadam 92f6558e55 the whole view is now composed from a single root widget 2020-02-06 21:16:02 +01:00
zadam 8d49249ed7 fix lazy initialization of the sidebar 2020-02-06 20:04:43 +01:00
zadam d1bb62c40e fixes 2020-02-05 22:46:20 +01:00
zadam 42017fde5f refactored access to options on frontend 2020-02-05 22:08:45 +01:00
zadam 786bbbc160 sidebars are now represented as widgets 2020-02-04 22:46:17 +01:00
zadam 0cc013c13f left sidebar can now be also collapsible 2020-02-04 20:42:40 +01:00
zadam b757dfcf79 various fixes and small refactorings 2020-02-03 21:56:45 +01:00
zadam 44ddcdd852 various widget optimizations for faster note switching 2020-02-03 21:16:33 +01:00
zadam 66204811cf refactored note creation methods into a separate service 2020-02-03 20:07:34 +01:00
zadam 822a8509b3 fix 2020-02-02 22:33:50 +01:00
zadam 9f62490a75 refactorings of note creation code 2020-02-02 22:32:44 +01:00
zadam b63ecba695 clean up tree service WIP 2020-02-02 22:04:28 +01:00
zadam d5ae3802d1 various widget refactorings 2020-02-02 21:16:20 +01:00
zadam 7c6cd63a53 various widget refactorings 2020-02-02 20:02:08 +01:00
zadam 62a80ef016 standard widget => collapsible widget 2020-02-02 18:46:50 +01:00
zadam 27ab55d26a fixed switch between autobook and text 2020-02-02 11:44:08 +01:00
zadam 34150e7177 fix inserting link 2020-02-02 11:14:44 +01:00
zadam b946599320 Merge remote-tracking branch 'origin/master' into m41 
# Conflicts:
#	src/public/javascripts/services/tree.js
 2020-02-02 10:45:27 +01:00
zadam 3cd4be4e48 removed note detail service 2020-02-02 10:41:43 +01:00
zadam 96e2b9bc18 fix tree keyboard shortcuts propagating outside of tree 2020-02-02 10:10:37 +01:00
jasontan056 adb8caa8a2
Fix corner case preventing notes from being created before ckeditor is initialized (#849) 
* Pass deleteId to deleteBranch in ensureNoteIsAbsentFromParent

* Add checks for whether window.cutToNote is defined.

* check ckEditor initialized.
 2020-02-02 09:28:19 +01:00
zadam 0054a32dc7 treecache now manages reloading when starting protected session 2020-02-01 22:29:32 +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 9f38ea6ee7 update tab title upon its change 2020-02-01 19:25:37 +01:00
zadam 0e13678f7c note complement is now loaded through tree cache 2020-02-01 18:29:18 +01:00
zadam f0cbca2838 lazy loading of note complement 2020-02-01 11:33:31 +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 0f25c8a95f autobook should not be active on the mobile interface 2020-02-01 10:17:03 +01:00
zadam 1a49894adf fix tree loading on mobile interface, closes #839 2020-02-01 10:04:18 +01:00
zadam bd8c078fb9 Merge remote-tracking branch 'origin/master' 2020-02-01 09:30:14 +01:00
zadam 6e060b87b8 fix date parsing in local timezone, closes #845 2020-02-01 09:29:56 +01:00
jasontan056 2375b170ba
Pass deleteId to deleteBranch in ensureNoteIsAbsentFromParent (#846) 2020-02-01 09:05:23 +01:00
zadam eeedb91ef7 sync are sent upon DB commit 2020-01-31 22:32:24 +01:00
zadam 05b51c0f68 frontend sync through websocket 2020-01-31 20:52:31 +01:00
zadam 8bf794f13b wip 2020-01-30 22:38:31 +01:00
zadam 48b401164a wip 2020-01-29 22:32:22 +01:00
zadam b65631be7e tree change listener and others 2020-01-29 21:38:58 +01:00
zadam 439b45b0b8 refactored entity reloading 2020-01-29 20:14:02 +01:00
zadam 976b2aa6f5 got rid of "origParentNoteId" since it's not needed anymore 2020-01-28 22:39:44 +01:00
zadam 88213c1bbd attributes are now updated only if their type and name does not change, in case of relation not even value must change. If they do, the old attribute is deleted and new is created instead 2020-01-28 22:37:06 +01:00
zadam d2e3aedf7f moving notes across parents now deletes the old branch and creates new which makes detecting changes much easier 2020-01-28 22:15:33 +01:00
zadam 368d3b1b97 wip 2020-01-28 21:54:28 +01:00
zadam 9301679707 wip 2020-01-27 22:58:03 +01:00
zadam 865f7e1ee1 fix propagating note reloads 2020-01-27 20:07:33 +01:00
zadam c243d2e85c sync changes wip 2020-01-26 11:41:40 +01:00
zadam 97a35d6fba wip 2020-01-26 10:42:24 +01:00
zadam 3f0974d3d2 smaller fixes 2020-01-25 18:29:32 +01:00
zadam 48a7c0235f fixed iconClass and cssClass 2020-01-25 14:48:53 +01:00
zadam ac7d5f2e81 fixes, separation of notefull from noteshort 2020-01-25 14:37:12 +01:00
zadam 516e6c35da fixes 2020-01-25 13:46:55 +01:00
zadam 7cad386a56 frontend attribute cache refactoring WIP 2020-01-25 13:27:23 +01:00
zadam 60c908cd63 frontend attribute cache refactoring WIP 2020-01-25 11:52:45 +01:00
zadam 52a907651e reduce unnecessary tab activation events 2020-01-25 10:25:06 +01:00
zadam 3254b551d8 merged tree utils into tree service 2020-01-25 09:56:08 +01:00
zadam 7a62d1636b fixes 2020-01-24 22:30:17 +01:00
zadam 7d9b720ea8 fix note switching in current tab 2020-01-24 21:15:40 +01:00
zadam ba500a3a80 fixes 2020-01-24 20:15:53 +01:00
zadam 606d5afcab refactoring of note detail API 2020-01-24 17:54:47 +01:00
zadam 4b66765cc1 refactoring 2020-01-24 15:44:24 +01:00
zadam 8651e47118 small fixes 2020-01-22 22:29:55 +01:00
zadam 34bc02965f book and search fixes 2020-01-22 22:05:28 +01:00
zadam eacefeb08b converted remaining type widgets 2020-01-22 21:38:00 +01:00
zadam 11a61325f9 removed last global keyboard handlers 2020-01-22 20:48:56 +01:00
zadam 370c63986d converting more keyboard shortcuts 2020-01-22 19:41:19 +01:00
zadam c63bb7ce8a converted more keyboard actions 2020-01-21 22:54:16 +01:00
zadam af5c623671 simplification of triggering events from links 2020-01-21 22:08:41 +01:00
zadam 55d1f9e9f0 import & export fixed 2020-01-21 21:43:23 +01:00
zadam 96a7b4e45e fix dialogs 2020-01-21 20:54:00 +01:00
zadam c83ca78565 keyboard handlers for dialogs 2020-01-20 22:35:52 +01:00
zadam c5eac8f438 keyboard handlers for tabs 2020-01-20 20:51:22 +01:00
zadam 9bc1f5af45 WIP 2020-01-19 22:05:45 +01:00
zadam 423a70d102 saving note detail 2020-01-19 21:40:23 +01:00
zadam 562c729ed6 more refactorings 2020-01-19 21:24:14 +01:00
zadam 0760dc742b refactored tab activation 2020-01-19 21:12:53 +01:00
zadam 1098d75ce0 synchronous events, updating title works fully 2020-01-19 20:18:02 +01:00
zadam bd8e5f255b wip 2020-01-19 19:33:35 +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 49c0d3199d progress 2020-01-19 15:44:18 +01:00