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
3488 commits 38 branches 306 tags 138 MiB
Commit graph

1653 commits

Author SHA1 Message Date
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 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 52f4876f2d camelCase keyboard action names 2020-02-19 20:54:14 +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 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 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 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 6e060b87b8 fix date parsing in local timezone, closes #845 2020-02-01 09:29:56 +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 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 49c0d3199d progress 2020-01-19 15:44:18 +01:00
zadam 416d733510 got rid of .renderTo(), tab caching widgets use hidden marker element 2020-01-19 15:36:42 +01:00
zadam 6de4914ea6 extracted widgets from note title 2020-01-19 13:19:40 +01:00
zadam 9f1e777e6d introduction of refreshWithNote 2020-01-19 11:37:24 +01:00
zadam adb9ce5e93 empty widget type works 2020-01-19 11:20:02 +01:00
zadam 746181689f component => type widget refactoring 2020-01-19 11:03:34 +01:00
zadam a99c016818 file note layout tweaks 2020-01-19 10:29:21 +01:00
zadam 37f279fab0 Merge branch 'master' into m41 
# Conflicts:
#	src/public/javascripts/services/entrypoints.js
 2020-01-19 09:30:38 +01:00
zadam ab535bf147 fixes of the new CopyWithoutFormatting 2020-01-19 09:25:35 +01:00
Heniker 1876664dfb add hotkey to copy contents with line breaks, fixes #349 (#831) 2020-01-19 09:16:36 +01:00
zadam e355b449c4 code and file note types now sort of work now as well 2020-01-19 09:02:18 +01:00
zadam 6d276582cb switching notes and tabs now work for most widgets 2020-01-18 20:49:49 +01:00
zadam 493730dff6 working note type and note paths widgets 2020-01-18 19:46:30 +01:00
zadam b00a9f4415 progress 2020-01-18 18:01:16 +01:00
zadam 97b13ae91d refactroring WIP 2020-01-16 22:44:36 +01:00
zadam 0178232f26 more tab row refactoring 2020-01-15 22:35:15 +01:00
zadam cc138ef9f8 more tab row refactoring 2020-01-15 22:27:52 +01:00
zadam 1552c3804d tab row refactoring WIP 2020-01-15 22:11:30 +01:00
zadam 7963de0abc continuing refactoring 2020-01-15 21:36:01 +01:00
zadam f98a20928c widgetized standard toolbar 2020-01-15 20:10:54 +01:00
zadam 209b1610f6 widgetizing tab pane 2020-01-15 19:40:17 +01:00
zadam bd0f7d3680 move components 2020-01-14 21:52:18 +01:00
zadam f852e1de81 removed sidebar code 2020-01-14 21:48:19 +01:00
zadam c9770573b2 converting sidebar widgets to normal widgets 2020-01-14 21:23:32 +01:00
zadam 23701219e1 added TabCachingWidget 2020-01-14 20:27:40 +01:00
zadam c9bc4ad108 widgetizing note detail WIP 2020-01-13 21:48:44 +01:00
zadam 8b9c235465 widgetizing promoted attributes 2020-01-13 20:25:56 +01:00
zadam 657d01da95 fix 2020-01-12 23:05:31 +01:00
zadam 17e2627a34 more refactoring ... 2020-01-12 23:03:55 +01:00
zadam bf7541bfb9 more refactoring ... 2020-01-12 20:15:05 +01:00
zadam 9d81bf030d tab row widgetizing 2020-01-12 19:05:09 +01:00
zadam f25d735b9d further tab management moved to app context 2020-01-12 12:48:17 +01:00
zadam 4d16018f6c fixes 2020-01-12 12:37:44 +01:00
zadam 5e11840137 moved tab management to app context 2020-01-12 12:30:30 +01:00
zadam 61474defff widgetizing tree WIP 2020-01-12 11:15:23 +01:00
zadam b12e38c231 widgetizing tree WIP 2020-01-12 10:35:33 +01:00
zadam d1f679ab90 refactoring clipboard WIP 2020-01-12 09:57:28 +01:00
zadam 0f8a7bad06 moved tree initialization into the widget 2020-01-12 09:12:13 +01:00
zadam 9e031dcd60 start of the refactoring to widget system 2020-01-11 21:19:56 +01:00
zadam 51c3f98dde pane rename 2020-01-11 18:33:43 +01:00
zadam 7877443fb4 Merge branch 'stable' 2020-01-11 09:41:42 +01:00
zadam 67bdffb27b expose text editor instance and method to add text to editor, closes #819 2020-01-10 20:10:17 +01:00
zadam 3386dace3b provide context menu in text editor also with disabled spellcheck 2020-01-10 19:56:27 +01:00
zadam f3a2e2cbde Merge branch 'stable' 2020-01-08 21:39:17 +01:00
zadam 3e49a7dbfa all consistency checkers have now fixers 2020-01-08 19:28:22 +01:00
zadam 4c7c3105e8 Merge branch 'stable' 
# Conflicts:
#	src/services/notes.js
 2020-01-07 22:29:54 +01:00
zadam f782d2bef9 don't empty script area on save 2020-01-07 22:29:15 +01:00
zadam ccaa9eae3a fix context submenus, closes #810 2020-01-07 20:53:41 +01:00
zadam 24c5388e0c protection against text note initialization race conditions 2020-01-07 19:48:26 +01:00
zadam 1cd2711097 Merge branch 'stable' 2020-01-05 20:02:19 +01:00
zadam 2150619d62 activateNewNote does not reload whole tree anymore 2020-01-04 21:53:49 +01:00
zadam acb76e0630 added notification to empty book notes otherwise they look suspiciously empty 2020-01-04 21:24:39 +01:00
zadam d025cfee1b empty note with just included note should be saved, closes #807 2020-01-04 13:22:07 +01:00
zadam f377a84fa1 hide/show button z-index tweak 2020-01-04 09:21:42 +01:00
zadam b8f2797abf better behavior of note info widget in tight width 2020-01-04 09:04:08 +01:00
zadam 54d89a9f47 allow configuring the time period before deleted notes are erased (and changed the default to 7 days) 2020-01-03 22:32:49 +01:00
zadam 94a0a31f17 refactoring of tree handling to recommended fancytree 2020-01-03 21:15:45 +01:00
zadam 50431dd55a hide "show/hide sidebar" button in zen mode, fixes #805 2020-01-03 20:12:19 +01:00
zadam 14f3c783f2 undelete note WIP 2020-01-03 13:14:43 +01:00
zadam c1d0a1e07b undelete note WIP 2020-01-03 10:48:36 +01:00
zadam 1d3608b7bf fix recent note dialog for deleted notes 2020-01-03 09:04:38 +01:00
zadam ac75fd2ca3 focus and activate should work together 2020-01-02 19:07:50 +01:00
zadam 3b98428c8c change order of execution to mitigate race conditions 2020-01-02 19:03:54 +01:00
zadam 82420fe5f6 reactivate "cut to note", closes #795 2020-01-01 22:59:51 +01:00
zadam 51dddb0bbb fix scrolling behavior in firefox 2020-01-01 19:57:57 +01:00
zadam 8b9bf6e46f expand to note to be able to activate note 2020-01-01 19:46:27 +01:00
zadam 3f1d0e5872 small template refactoring 2019-12-30 19:46:48 +01:00
zadam 0fe91d0184 include note feature 2019-12-30 19:32:45 +01:00
zadam 2f711a12f8 added "include note" widget to text notes, WIP 2019-12-29 23:46:40 +01:00
zadam 64f32ba38f fix zen mode with new layout, closes #794 2019-12-29 20:48:24 +01:00
zadam e4a09c6207 fix left pane scrolling, closes #788 2019-12-28 21:37:13 +01:00
zadam d467db2227 unify API for creating note links 2019-12-28 21:10:02 +01:00
zadam b8d6ff0542 reset file inputs to allow reuploading the same file again 2019-12-28 19:29:52 +01:00
zadam a9b8e65c9b force scrolling when width of the content overflows 2019-12-28 19:18:44 +01:00
zadam bb8b563ece relaunch app after successful sync 2019-12-28 12:55:53 +01:00
zadam 05a8ffb944 small fixes 2019-12-28 10:28:12 +01:00
zadam 3d95d69f80 styling hack for the design to look correct in both FF and chrome 2019-12-27 21:18:14 +01:00
zadam ab79f24729 added content style to tar html export as well 2019-12-25 11:34:45 +01:00
zadam cec71f65b3 load ckeditor content style for printing to have more similar look to the in-editor, #782 2019-12-25 10:59:45 +01:00
zadam a155b6e8d5 create separate window for setup and then main window 2019-12-24 14:42:03 +01:00
zadam 229974e543 added option to enable native title bar (disabled by default) 2019-12-24 12:10:32 +01:00
zadam 6fc19bfb93 Merge branch 'stable' 2019-12-24 11:55:27 +01:00
zadam 0a72383495 make opening new links from ckeditor more consistent for internal and external links, closes #779 2019-12-24 10:49:16 +01:00
zadam d389100611 properly cleanup sidebar content after closing tab 2019-12-23 21:46:37 +01:00
zadam ea7257a5b2 cleaned up experimental attribute pane 2019-12-23 21:13:56 +01:00
zadam 0ebc947fbd visual tweaks 2019-12-23 21:05:47 +01:00
zadam c89514f9bb saving size and visibility state of the panes 2019-12-23 20:34:29 +01:00
zadam e0368e395c removed left and right sidebar sizing options 2019-12-23 19:45:59 +01:00
zadam 6986c201dd removed hideTabRowForOneTab option 2019-12-23 19:39:48 +01:00
zadam bcf163f8a1 css alignment 2019-12-23 17:12:17 +01:00
zadam 15aaead7b9 show/hide switcher for the sidebar 2019-12-23 16:48:34 +01:00
zadam d29c5c4758 sidebar pulled outside of the tab content and added splitter 2019-12-23 15:50:24 +01:00
zadam 81e2baeee5 blur title buttons after clicking 2019-12-23 13:46:26 +01:00
zadam 4cececafc9 added title bar buttons 2019-12-23 13:34:54 +01:00
zadam 7c8e7a3f4b frameless design with tabs on top, split for left panel 2019-12-23 11:52:45 +01:00
zadam 613d5f93e8 convert css grid design to flex based one 2019-12-23 08:52:57 +01:00
zadam 2bc18bc214 use main border color for tab border 2019-12-21 15:37:51 +01:00
zadam f31a998c5d path list contains a button to add a new path, closes #611 2019-12-21 13:55:13 +01:00
zadam a9702aa6a2 fix empty checkbox visibility, closes #775 2019-12-21 12:37:24 +01:00
zadam f98fa4098f clearer WS error message 2019-12-20 20:17:58 +01:00
zadam 5350496ed4 fix creating note from global ctrl+alt+p shortcut, closes #773 2019-12-20 20:13:21 +01:00
zadam b62d79044a fix creating note from relation map, closes #771 2019-12-20 19:02:52 +01:00
zadam 5988776b7e styling of active button 2019-12-18 20:16:11 +01:00
zadam eb4dfbad92 sync fixes 2019-12-16 22:47:07 +01:00
zadam aff9ce97ee small sync fixes 2019-12-16 22:00:44 +01:00
zadam a82066d899 ability to define a keyboard shortcut for paste markdown, closes #761 2019-12-10 23:04:18 +01:00
zadam 45c5287d53 protection against note switching race conditions 2019-12-10 22:35:24 +01:00
zadam dce54c7af3 run consistency checks on demand 2019-12-10 22:03:00 +01:00
zadam c48dbb0913 more debugging info for problems after sync 2019-12-10 21:31:24 +01:00
zadam 6f32d6fabe new mechanism to wait for sync after interaction with backend in Script API using api.waitForMaxKnownSyncId() 2019-12-09 23:07:45 +01:00
zadam 1e123f2390 sql console tweaks 2019-12-09 21:31:38 +01:00
zadam b29155775e Merge branch 'stable' 
# Conflicts:
#	package-lock.json
 2019-12-09 20:23:22 +01:00
zadam b821ed28fc refactor mention setup 2019-12-09 20:09:55 +01:00
zadam fdb8959aa1 move mime types loading to avoid race conditions 2019-12-09 20:06:36 +01:00
zadam 7554cb057b support unicode characters in filters without quotes, fixes #757 2019-12-09 19:38:48 +01:00
zadam fab959539a ability to run multiple queries (and get multiple result sets) from SQL console 2019-12-08 11:20:44 +01:00
zadam 156f040880 added "backend log" dialog 2019-12-05 21:25:36 +01:00
zadam 01cd9d8fb3 ckeditor 16 with code blocks plugin 2019-12-04 21:21:07 +01:00
zadam aa5ede5039 Merge branch 'stable' 2019-12-03 22:52:37 +01:00
zadam b0310e34e2 fix CSS loading from subdomain, #741 2019-12-03 22:13:02 +01:00
zadam 92d5f91aa6 Merge branch 'stable' 2019-12-03 20:33:42 +01:00
zadam 761c51069a use max-height for promoted attributes, #739 2019-12-03 19:47:53 +01:00
zadam e9454e4db7 fix SQL console scrolling 
(cherry picked from commit 749bb90713)
 2019-12-02 23:05:05 +01:00
zadam 749bb90713 fix SQL console scrolling 2019-12-02 23:04:22 +01:00
zadam eb8c296e62 attempt to make updating clients via websocket faster 2019-12-02 22:27:06 +01:00
zadam 6e83980784 aligning frontend attributes API with the backend one 2019-12-01 12:22:22 +01:00
zadam 2953f1bdb8 adding some standard classes for tree items 2019-11-28 22:05:27 +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 5e9bedd903 fixed sidebar switch in the options dialog 2019-11-26 20:46:49 +01:00
zadam e712990c03 don't remove active tab after deleting note to preserve tab state, fixes #727 2019-11-26 20:42:34 +01:00
zadam 91487b338a make the context menu scrollable when exceeding total window height, closes #723 2019-11-26 19:55:52 +01:00
zadam 94c904fb40 fix context menu over root, closes #726 2019-11-26 19:42:47 +01:00
zadam bf9ad976b9 fixing non-root path issues, #404 2019-11-25 21:44:46 +01:00
zadam dbd2040bee shortcut fixes 2019-11-24 22:15:33 +01:00
zadam 1e979d71c7 changed note selection in tree using keyboard - now only sibling nodes are selected 2019-11-24 22:01:10 +01:00
zadam 6bbd4c59bc reduce flicker of "create new day note" 2019-11-24 21:40:50 +01:00
zadam 3a54d00e2b added shortcut filter in the options dialog 2019-11-24 20:20:13 +01:00
zadam 499c9a7381 separated some context menu items into "advanced" 2019-11-24 20:00:54 +01:00
zadam cd139bdd76 note can be activated through 'keyboardShortcut' label 2019-11-24 18:32:18 +01:00
Benoit Stahl a59943094e this input is text (#719) 2019-11-24 10:44:09 +01:00
zadam c400a7143c reorganization of shortcuts in the options 2019-11-24 10:40:18 +01:00
zadam 1f37d00e42 updating also shortcuts in element titles 2019-11-24 10:14:30 +01:00
zadam d21e824343 binding remaining actions 2019-11-24 09:50:19 +01:00
zadam 01ff34b5d4 moving edit branch prefix, search in subtree and toggle note hoisting to global entrypoints instead of being tree specific 2019-11-23 23:06:25 +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 ff0245f05f dynamically translating kbd based on actions 2019-11-22 22:35:59 +01:00
zadam 98c81faedb Merge branch 'stable' 2019-11-22 20:36:47 +01:00
zadam cfb850acb2 download fixes for the sub-domain web deployment 2019-11-22 20:35:17 +01:00
zadam a16aaf7a81 fix setup on non-root paths #404 2019-11-22 20:24:49 +01:00
zadam 465c3b87a7 tree keyboard shortcuts 2019-11-21 22:24:07 +01:00
zadam 0e5028acd3 support global shortcuts with global: prefix 2019-11-21 21:12:07 +01:00
zadam 7084ed4fb1 Merge branch 'stable' 2019-11-20 23:11:21 +01:00
zadam 587134c2f8 separators and fixes 2019-11-20 23:10:41 +01:00
zadam 5fac2c7633 saving options keyboard shortcuts 2019-11-20 22:48:32 +01:00
zadam 08a518479b keyboard shortcuts options pane 2019-11-20 21:35:18 +01:00
zadam 522f71cb91 fix tree clipboard 2019-11-20 19:24:23 +01:00
zadam bcdfb47939 Merge branch 'stable' 2019-11-19 23:34:35 +01:00
zadam 667471e7bb toggle zen mode in the global menu 2019-11-19 23:33:07 +01:00
zadam 07043fb177 switch search in subtree to ctrl+shift+s to stay consistent with ctrl+s 2019-11-19 23:04:43 +01:00
zadam 3c4ec7fe1a keyboard shortcuts WIP 2019-11-19 23:02:54 +01:00
zadam 1f8d382b1f added "search in subtree" context menu, #534 2019-11-19 21:11:20 +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 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 a1181623b7 hide sidebar button styling 2019-11-17 11:58:05 +01:00
zadam 73a6c66379 header styling changes 2019-11-17 11:39:06 +01:00
zadam 1d5daa8dfd action icons now have hover border as well 2019-11-17 11:30:11 +01:00
zadam 834e1f7253 fix activating tab when app was closed last time with "new tab" 2019-11-17 10:24:06 +01:00
zadam c141f4b2c0 tab row styling change 2019-11-17 10:22:26 +01:00
zadam 1838f097e5 added getAllNotePaths, fixes #708 2019-11-16 19:07:32 +01:00
zadam 3d294c5163 refactoring of note creation APIs WIP 2019-11-16 17:00:22 +01:00
zadam 60231de0ed refactoring of note creation APIs WIP 2019-11-16 12:28:47 +01:00