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

684 commits

Author SHA1 Message Date
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
2bf2ec5a6c link map WIP 2019-06-09 21:48:30 +02:00
zadam
412b0377e9 added panzoom to link map 2019-06-09 11:50:11 +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
d3ac7b0939 fix disappearing expander in some cases, closes #562 2019-06-07 22:37:10 +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
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
b5143c152b link map empty dialog 2019-06-02 15:35:57 +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
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
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
zadam
bb43014230 hide search help tooltip on executed search 2019-05-29 20:27:48 +02:00
zadam
8d3262d232 fix setting the title bar when switching note 2019-05-29 19:55:05 +02:00
zadam
3fdecee95f fix bug with unresponsive tree after tree reload 2019-05-28 20:22:16 +02:00
zadam
35648b9f37 fix protected shield background visibility 2019-05-22 22:26:55 +02:00
zadam
494a980ecb fixes for drag & create new note in relation map 2019-05-22 22:22:29 +02:00
zadam
027b3eaed8 fix tab dragging issue 2019-05-22 21:59:14 +02:00
zadam
dedc1e708f fix redirect after login 2019-05-22 21:25:13 +02:00
zadam
79956b5676 mobile web fixes 2019-05-22 20:53:59 +02:00
zadam
48b1aece4d fix history navigation 2019-05-21 22:35:01 +02:00
zadam
eee75bd2e8 fix node focus after hoisting 2019-05-21 22:07:08 +02:00
zadam
29828f8e8f fix recent notes (db & sync version increase) 2019-05-21 21:47:28 +02:00
zadam
ced02b42b5 new card for tab operation in built-in help 2019-05-21 20:43:03 +02:00
zadam
3fe9218ea8 refactoring/cleanup 2019-05-21 20:24:40 +02:00
zadam
32fae5e9e8 same note in different tabs are synced 2019-05-20 22:25:04 +02:00
zadam
48b4488a58 deleting a note will close all tabs containing the note 2019-05-20 21:50:01 +02:00
zadam
aead6a44de render notes should now return elements to append instead of modifying DOM directly 2019-05-19 21:52:28 +02:00
zadam
f59f08fa0e fix note paths 2019-05-19 21:22:35 +02:00
zadam
119d7367da tree fixes 2019-05-19 18:21:29 +02:00
zadam
ddb99a0917 ctrl+enter should work only on tab detail 2019-05-19 16:56:16 +02:00
zadam
597eb5a300 ctrl+alt+p will create new note in a new tab 2019-05-19 10:46:19 +02:00
zadam
f3e7e6bbe7 fix render note attributes 2019-05-19 10:30:00 +02:00
zadam
722380e7b8 fix access to editor instance if active note is not text 2019-05-19 09:13:13 +02:00
zadam
f22cc37df7 middle click can now open links in new tab (and close tab) 2019-05-15 21:50:27 +02:00
zadam
dd1fc23fe8 work on hash & history 2019-05-14 22:29:47 +02:00
zadam
2178f82324 fixes to mobile version (WIP) 2019-05-13 23:08:59 +02:00
zadam
79d779dee8 setup cssClass for both note tab and content, #524 2019-05-13 22:08:06 +02:00
zadam
fab8b77794 configurable hiding of tab row for one tab 2019-05-12 21:45:30 +02:00
zadam
8b030a2323 new tab now has note autocomplete 2019-05-12 17:28:20 +02:00
zadam
14c420b782 new tab infrastructure 2019-05-12 12:58:55 +02:00
zadam
637547a3fa add new tab button, WIP 2019-05-12 10:59:53 +02:00
zadam
c39c1baa4d further simplification 2019-05-12 10:21:27 +02:00
zadam
b9edd0ecc7 tabs simplification 2019-05-12 10:11:41 +02:00
zadam
2dec8f1ad6 hoisting note now seems to work correctly in relation to tabs 2019-05-11 21:27:27 +02:00
zadam
bd97df5ee9 refactored chrome tabs into "tab row" 2019-05-11 19:44:58 +02:00
zadam
8a501521e8 some refactoring etc. 2019-05-11 19:27:33 +02:00
zadam
be68391c37 store "openTabs" session 2019-05-10 21:43:40 +02:00
zadam
89d4be504d tree active note now follows switched tabs (without changing scroll position) 2019-05-09 21:30:08 +02:00
zadam
a7a42ff4af use notePath in tabContext 2019-05-08 20:14:41 +02:00
zadam
bacf163c96 NoteContext => TabContext 2019-05-08 19:55:24 +02:00
zadam
db7e083a21 ctrl-click opens new tab 2019-05-08 19:10:45 +02:00
zadam
8eaf44735a context menu on link to open in new tab 2019-05-07 22:33:53 +02:00
zadam
4ea27e604f context menu on tab and "close all except for this tab" 2019-05-07 21:34:01 +02:00
zadam
aef0e552a0 ctrl+tab and ctrl+shift+tab can be used to switch tabs 2019-05-07 21:04:07 +02:00
zadam
d36bff2a97 protected session in a dialog now works, proper reloading 2019-05-05 20:45:07 +02:00
zadam
61696f0287 protected session in a component now works 2019-05-05 19:48:30 +02:00
zadam
9a97fe09ee note actions now work again 2019-05-05 18:24:59 +02:00
zadam
b1d0cef33b tabs WIP 2019-05-05 10:59:34 +02:00
zadam
7f0c92c56b attributes and children overview working again 2019-05-04 22:44:25 +02:00
zadam
32439ed006 tabs WIP 2019-05-04 14:34:03 +02:00
zadam
ff41904d72 convert more note details to new style 2019-05-04 00:16:41 +02:00
zadam
39093cbc4c basic opening and switching tabs 2019-05-03 21:50:14 +02:00
zadam
c7b5784123 context menu refactoring 2019-05-03 20:27:38 +02:00
zadam
0d11cadc18 tabs wip 2019-05-02 22:24:43 +02:00
zadam
63ab82a076 tabs wip 2019-05-01 23:06:18 +02:00
zadam
7e03f14e01 tabs wip 2019-05-01 22:19:29 +02:00
zadam
c9183f8bd4 #note-detail-wrapper => .note-tab-content 2019-05-01 10:17:17 +02:00
zadam
8205cdc288 fix creation of top level note, closes #501 2019-04-29 21:18:12 +02:00
zadam
f4b986e1c1 added global menu item for fullscreen toggle 2019-04-28 21:59:29 +02:00
zadam
c0496ebef3 f11 can now toggle Trilium window to/from fullscreen 2019-04-28 21:52:25 +02:00
zadam
3035a948b9 less hacky way to implement distraction free mode which also fixes scrollbar 2019-04-28 21:24:13 +02:00
zadam
7880cf62fe open links from render note 2019-04-28 17:44:00 +02:00
zadam
eac5ec6e26 added searchForNote(s) also to frontend API 2019-04-22 22:52:09 +02:00
zadam
15eaf67189 fix broken history navigation 2019-04-22 17:13:24 +02:00
zadam
983d9c4319 fix merge issue 2019-04-22 17:05:04 +02:00
zadam
a88a00b60e Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/javascripts/services/note_detail_file.js
#	src/services/build.js
 2019-04-22 16:29:16 +02:00
zadam
69677b15fe fix broken file download 2019-04-22 15:01:05 +02:00
zadam
f0e22b70f6 tree reload doesn't necessarily re-activates the note 2019-04-20 21:14:48 +02:00
zadam
225e893461 fix closing of tooltips 2019-04-20 09:39:39 +02:00
zadam
064a11d872 don't allow deleting hoisted note + other related fixes, closes #488 2019-04-16 21:40:04 +02:00
zadam
77c9b64dc7 re-enable animation for expanding since it seems to fix fancytree rendering glitches 2019-04-14 19:43:44 +02:00
zadam
47cb7c7f5e not refreshing tree after sort operation because it messes with everything ... 2019-04-14 18:32:56 +02:00
zadam
1bd769827d faster opening of the date notes (no animation) 2019-04-14 18:16:15 +02:00
zadam
71916b5e28 empty icon for some menu actions do de-emphasize less important items 2019-04-14 13:51:21 +02:00
zadam
b2d4330692 added button for reloading frontend 2019-04-14 12:48:50 +02:00
zadam
253a6ef081 added date note APIs to frontend script API 2019-04-14 12:24:48 +02:00
zadam
e1e020c1a4 more reliable reimplementation of "create day sub note" 2019-04-14 12:18:52 +02:00
zadam
2b4413a1bd exposing tree cache methods to reload note's parents/children to frontend API 2019-04-13 22:56:45 +02:00
zadam
dae674a7cd tree cache reloading 2019-04-13 22:10:16 +02:00
zadam
896776516b fix in page search in browser (didn't appear after ctrl+f) 2019-04-09 21:16:18 +02:00
zadam
a27525af9e frontend API additions 2019-04-09 21:13:47 +02:00
zadam
ef1b32d586 search error handling & sanitize input for default fulltext 2019-04-02 22:52:42 +02:00
zadam
fe3a0bc756 new find-in-page dialog (using electron-find) which actually works 2019-04-02 21:44:56 +02:00
zadam
3670800a51 set cookie header only for electron calls 2019-04-01 21:18:11 +02:00
zadam
90a331b989 some style fixes and refactoring for tree context menu 2019-04-01 21:11:20 +02:00
zadam
26621c0318 short search help in the tooltip 2019-03-31 21:19:10 +02:00
zadam
75dbaa4b77 fix csrf protection on electron build 2019-03-31 12:49:42 +02:00
zadam
9a5a085103 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	src/public/javascripts/services/server.js
#	src/services/app_info.js
#	src/services/notes.js
 2019-03-30 22:11:03 +01:00
zadam
b51ac112a2 fix loading of protected session in electron, #469 2019-03-30 18:00:08 +01:00
zadam
a1ac609b34 search input tooltip WIP 2019-03-30 17:41:53 +01:00
zadam
9f69294f7f
Merge pull request #466 from capi/ctrl-shift-l 
Add Ctrl+Shift+L to pre-select "add to note"
 2019-03-30 10:13:31 +01:00
zadam
7bbf797caf saved search note now has refresh button, closes #369 2019-03-30 00:12:32 +01:00
zadam
f479c0e10e when note is created, it's automatically present in all cloned parents as well 2019-03-29 23:55:28 +01:00
zadam
89b8e2bb08 redesign of search input. Saved search is now saved under active note and doesn't need page reload 2019-03-29 23:24:41 +01:00
zadam
27cee1cf33 fix closing of context menu on FF66, closes #468 
(cherry picked from commit 3c56d29fca)
 2019-03-28 20:57:11 +01:00
zadam
3c56d29fca fix closing of context menu on FF66, closes #468 2019-03-28 20:54:17 +01:00
zadam
29c60581a6 yet another refactoring of working with note's payload/content 2019-03-26 22:24:04 +01:00
Martin Carpella
44c742e839 Add Ctrl+Shift+L to pre-select "add to note" 2019-03-25 21:09:15 +01:00
zadam
6c7e2f0aa1 moved "About" from options dialog to a separate dialog under global menu 2019-03-24 23:01:33 +01:00
zadam
9fc5d328b4 added CSRF protection using csurf express middleware, fixes #455 2019-03-24 22:41:53 +01:00
zadam
fc13e1fa6a added possibility to search by attached script returning note ids + some refactorings 2019-03-20 22:28:54 +01:00
zadam
9ca680f842 handle empty search note 2019-03-20 21:01:00 +01:00
zadam
616829464f refactoring of context menu items, got rid of ContextMenuItemsContainer 2019-03-19 22:56:37 +01:00
zadam
0267468cd5 deleting without reloading the whole tree (at least on frontend) 2019-03-18 23:03:41 +01:00
zadam
ca0d17d93a cloning is now done without reloading the whole tree 2019-03-18 22:33:19 +01:00
zadam
3f656ea76f refactoring and fix icon assignment 2019-03-18 22:10:10 +01:00
zadam
1faf2c6ecd fixes for some note moving edge cases, closes #454 2019-03-18 21:59:53 +01:00
zadam
33f2aaa650 note type context submenu now works end to end 2019-03-17 12:19:23 +01:00
zadam
177caec011 note type context submenu WIP 2019-03-17 11:38:27 +01:00
zadam
3ee33e1024 refactoring of joins for search 2019-03-16 19:57:39 +01:00
zadam
ef40c66344 renamed currentNote to activeNote to be consistent with frontend API 2019-03-14 20:21:27 +01:00
zadam
b68b0fe783 Merge branch 'master' into dev31 2019-03-13 21:53:41 +01:00
zadam
b4c6d9f800 using now session cookies to store protectedSessionId 2019-03-13 21:53:09 +01:00
zadam
0144dc12df current note as in note loaded into right pane is now called "active note" in frontend API 2019-03-12 21:52:19 +01:00
zadam
6d09931a39 add getCurrentNote() frontend API, #444 2019-03-12 21:39:35 +01:00
zadam
05374becfd Merge branch 'master' into dev31 2019-03-10 10:11:01 +01:00
zadam
a432ad7483 fix isProtected consistency for images and files + related consistency check 2019-03-08 22:25:12 +01:00
zadam
ee58bf3d5c fix bundle execution error handling 2019-03-07 20:51:55 +01:00
zadam
a6fd3bfb00 placeholder for note content 2019-03-04 22:39:44 +01:00
zadam
610dd8a783 upgrade to ckeditor 12.0.0 2019-03-04 22:36:46 +01:00
zadam
5b251b9977 added drag & drop files on note detail 2019-02-26 21:37:15 +01:00
zadam
8b3e721028 added "explodeArchives" option to the import dialog 2019-02-25 22:38:48 +01:00
zadam
7e2a2baa5d drag & drop now uses import code 2019-02-25 22:28:15 +01:00
zadam
936f85c09e drag & drop multi file upload to note tree 2019-02-23 20:33:27 +01:00
zadam
b25deea21d fixes for relative paths 2019-02-22 23:03:20 +01:00
zadam
9f29521ab8 disable caching of note autocomplete for more accurate results 2019-02-17 20:59:52 +01:00
zadam
c1ce0c6b22 avoid various HTTP server issues with slashes by putting notePath into the body with POST 2019-02-17 20:49:51 +01:00
zadam
1359dd86c2 OPML 2 import, closes #298, #286 2019-02-16 22:13:29 +01:00
zadam
96de2e7008 fixed saved search 2019-02-15 21:21:26 +01:00
zadam
b0596c9eb2 removed noteId display in the note detail, #408 2019-02-14 20:57:56 +01:00
zadam
2a2319d434 created note info dialog, closes #408 2019-02-14 20:56:33 +01:00
zadam
cde68abec9 progress of tar import through WS 2019-02-10 16:36:25 +01:00
zadam
51175e3676 import/export refactorign 2019-02-10 15:33:56 +01:00
zadam
45ddfef30a new import dialog 2019-02-10 14:33:13 +01:00
zadam
1e1d78999e some help dialog content 2019-02-10 12:19:48 +01:00
zadam
92fcd7b345 sql console added to global menu and now has schema info 2019-02-10 10:38:18 +01:00
zadam
176c3a5d51 added dev tools to global menu 2019-02-09 19:25:55 +01:00
zadam
c487a95bc7 note content refactoring, WIP 2019-02-06 21:29:23 +01:00
zadam
8884177d9f split out note's content into separate entity, WIP 2019-02-06 20:19:25 +01:00
zadam
8b250ed523 fix upload of the same file in succession, #388 2019-02-03 17:44:06 +01:00
zadam
707df18b93 added type and mime classes on body as well #383 2019-01-28 21:42:37 +01:00
zadam
90895f1288 added noteId to file view 2019-01-27 23:10:37 +01:00
zadam
2c1580ea65 appCss/appTheme are now loaded as external CSS files instead of inline styles 2019-01-27 17:01:37 +01:00
zadam
fb27088fcd smaller children overview font 2019-01-27 14:26:39 +01:00
azivner
76fbff68ba added readOnly attribute which puts text editor into readonly mode #371 2019-01-27 13:10:03 +01:00
azivner
a87f4d8653 search can be triggered from URL, closes #385 2019-01-25 22:18:34 +01:00
azivner
580104c4c5 using trilium's confirm dialog, small refactoring 2019-01-24 22:18:31 +01:00
Phil Marshall
929e0f69c2 add confirm type change dialog when note not empty 2019-01-23 15:15:24 -06:00
azivner
e70af1300a drag and drop moves multiple items only if CTRL is pressed, active note has now bold text for more differentiation from selected note 2019-01-23 21:13:04 +01:00
azivner
4d0e46021b Mac uses CMD+Left, CMD+Right for history navigation, closes #376 2019-01-23 20:15:33 +01:00
azivner
2ac560c56e text note should change its icon after having new note inserted into, fixes #361 2019-01-22 21:21:44 +01:00
azivner
596544eca3 fix setNoteToParent API method, closes #360 2019-01-20 16:33:09 +01:00
azivner
19d8947123 runOnNoteChange fires also on the frontend, closes #340 2019-01-16 22:52:32 +01:00
azivner
35edce7523 fix crazy clipboard operation on mac setup, closes #348 2019-01-16 22:03:30 +01:00
azivner
cce8c1b674 create top level note and collapse tree now work relative to hoisted note, closes #343 2019-01-15 20:30:54 +01:00
azivner
e50f9cd0a3 fix device detection in setup 2019-01-14 23:50:45 +01:00
azivner
6a3e7a5a8e generate css classes for each mime type, #328 2019-01-13 20:14:33 +01:00
azivner
eeead90f32 improved theme support using CSS variables, #328 2019-01-13 18:57:46 +01:00
azivner
9268f88bc3 frontend scripts now have startNote, currentNote and targetNote as NoteShort entities which e.g. provides easy access to relations/labels 2019-01-13 12:16:05 +01:00
azivner
3c19a712c0 active protected state button has darker background and is disabled 2019-01-11 23:29:56 +01:00
azivner
dffdb82288 after creating new note, it is focused and now also selected so renaming is super easy, #318 2019-01-10 22:46:08 +01:00
azivner
0b251530fa open recent notes autocomplete by focus so it is then closed with blur, fixes #272 2019-01-10 21:04:06 +01:00
azivner
48bbfb8bdb fix activating note by noteId when hoisting, fixes #320 2019-01-10 19:53:42 +01:00
azivner
4b977a3306 setup keyboard shortcuts on the setup page as well, closes #267 2019-01-09 22:08:24 +01:00
azivner
3ff3021acd shortcuts for mac should use cmd instead of ctrl, closes #290 2019-01-09 21:42:16 +01:00
azivner
99e56a9c42 make sure to save the search note before refreshing the tree 2019-01-09 19:54:32 +01:00
azivner
c8ec86e537 allow refreshing saved note, closes #304 2019-01-08 23:32:03 +01:00
azivner
05aee884b6 fix saving search note content #304 2019-01-08 22:48:53 +01:00
azivner
373408e401 fix Branch reference to parent note id after parent change 2019-01-05 19:25:22 +01:00
azivner
927415838c using enhanceTitle event instead of renderNode per https://github.com/mar10/fancytree/issues/927 2019-01-04 20:18:07 +01:00
azivner
9e2e6fb50c fixed glitch where "unhoist" button disappears after renaming the hoisted note 2019-01-02 19:26:01 +01:00
azivner
c85979b66b it should not be possible to add note after hoisted note 2019-01-02 18:59:08 +01:00
azivner
1771ddb787 responsive promoted attributes view and attribute overview to make sure note content is always visible. Fixes #262 2019-01-01 20:53:18 +01:00
azivner
3ab657fe46 created concept of "detail loaded listeners" which allow scripts to execute some action after the note detail has been loaded 2019-01-01 19:32:34 +01:00
azivner
8785dae753 force reload fancytree node when child is not found 2019-01-01 18:27:36 +01:00
azivner
66c639d5e3 frontend API addition to protect current note 2019-01-01 15:39:13 +01:00
azivner
6704b755d8 attribute overview shows only owned attributes 2019-01-01 15:29:58 +01:00
azivner
32220476aa better behavior on default loading detail / switching between tree and detail 2018-12-30 22:36:39 +01:00
azivner
2f680c4326 tweaks, fixes, refactorings, creating new note from detail, not tree 2018-12-29 10:04:59 +01:00
azivner
0b4a44a403 layout tweaks etc. 2018-12-29 09:13:52 +01:00
azivner
89299f865c api method to detect navigation away from current page 2018-12-29 08:40:35 +01:00
azivner
f6db9a50ab "switch to desktop version" button 2018-12-29 00:09:16 +01:00
azivner
78d9fac1e6 global actions context menu, logout 2018-12-28 23:57:11 +01:00