zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-17 13:14:44 +08:00
Code Issues Projects Releases Packages Wiki Activity
2452 commits 38 branches 306 tags 138 MiB
Commit graph

868 commits

Author SHA1 Message Date
zadam
c0c36d10e5 add attributes to the sidebar and remove them from the bottom 2019-08-06 20:05:05 +02:00
zadam
0556ab5e66 Merge branch 'stable' 
# Conflicts:
#	package.json
 2019-07-30 22:11:20 +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
083dee9bdd note activation from API will also scroll to it / focus 2019-07-28 14:47:35 +02:00
zadam
263bff903c mobile frontend shows only the active tab 2019-07-28 14:08:05 +02:00
zadam
85e4bd817b note revisions sidebar 2019-07-25 22:31:09 +02:00
zadam
b488adc330 sidebar POC WIP 2019-07-24 22:52:51 +02:00
zadam
849fad0421 link map in sidebar POC 2019-07-21 21:55:48 +02:00
zadam
eb28a3b0c9 note info sidebar widget 2019-07-21 11:32:38 +02:00
zadam
5283b489dc sidebar skeleton 2019-07-21 10:17:08 +02:00
zadam
3850f52401 add ResizeObserver to tabs with fallback for older firefox 2019-07-20 22:01:50 +02:00
zadam
3d7a5f20e7 make it again possible to open notes through URL hash 2019-07-09 22:12:05 +02:00
zadam
95a773e5c9 clipper doesn't open new tab if the note is already loaded in existing tab 2019-07-07 11:15:55 +02:00
zadam
093dfb4a39 Merge branch 'stable' 2019-07-06 13:14:46 +02:00
zadam
ddf381f92d fixed duplicated notes after creating into a folder which wasn't yet loaded 2019-07-06 13:14:33 +02:00
zadam
2b44f3bc76 fixed websocket reconnection 2019-07-06 12:03:51 +02:00
zadam
070e8d9647 Merge branch 'stable' 2019-07-03 20:51:34 +02:00
zadam
bf3360572a nest code editor instance to avoid visibility issues 2019-07-03 20:37:59 +02:00
zadam
e5036318af fix enter on title to the code editor 2019-07-03 20:29:55 +02:00
zadam
427a266c57 Merge branch 'stable' 2019-07-02 21:56:23 +02:00
zadam
196264b8c2 use bootstrap modal to confirm note deletion which fixes #582 2019-07-02 21:54:37 +02:00
zadam
afe24866f0 some debug logging for duplicated nodes 2019-07-02 20:35:06 +02:00
zadam
d18a20cc06 fix focus issue from title to the text content with tab/enter 2019-07-02 20:28:57 +02:00
zadam
ec4abe0d81 Merge branch 'stable' 2019-06-30 20:15:37 +02:00
zadam
af21dd4463 fix mobile text editor display 2019-06-30 20:14:57 +02:00
zadam
ef46727870 Merge branch 'stable' 2019-06-30 19:58:56 +02:00
zadam
1ea0d283de fix text instance sometimes remaining displayed when switching to e.g. image 2019-06-30 19:41:26 +02:00
zadam
c4b957427d implement print, closes #581 2019-06-29 22:57:47 +02:00
zadam
2f3b256272 Merge branch 'stable' 2019-06-29 20:37:51 +02:00
zadam
6e3d8472e1 avoid duplicate key error 2019-06-28 21:50:15 +02:00
zadam
2a9f36a027 fix activating parent note after delete 2019-06-27 22:58:04 +02:00
zadam
cf3726289c attempt to fix the duplicate issue 2019-06-27 21:24:25 +02:00
zadam
3851bedb57 Merge branch 't34' 2019-06-26 21:11:27 +02:00
zadam
a3951f1cce make sure autocomplete is closed when navigating to note 2019-06-26 21:08:54 +02:00
zadam
7c77ae758b fix frontend reload again 2019-06-26 20:49:17 +02:00
zadam
1b831f94a9 fix orphan note autocomplete, closes #569 2019-06-24 20:45:35 +02:00
zadam
d49cae9cea fix update of window title during note renaming 2019-06-24 20:12:04 +02:00
zadam
f45e25172b opening links from the clipper 2019-06-23 13:25:00 +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
a7cf3cdf05 fix unloading protected session after the timeout, fixes #571 2019-06-19 22:23:55 +02:00
zadam
c827d38f39 when single note is selected and it's the same that was right clicked for context menu, then we treat it as no-selection action 2019-06-17 22:25:22 +02:00
zadam
ee89111bfb fix clipboard operation for single nodes 2019-06-16 18:07:22 +02:00
zadam
288b3077b2 context menu items are now disabled when there are selected notes and the item does not support actions on multiple items 2019-06-16 12:06:06 +02:00
zadam
93f1d46104 fix tree activation/focus after deleting node 2019-06-16 11:12:07 +02:00
zadam
12b17b1e9e fix ctrl+. to switch focus to note tree 2019-06-16 10:41:22 +02:00
zadam
943b35fb7d fix delete with keyboard and context menu regarding the selection 2019-06-13 22:55:06 +02:00
zadam
f1967fd466 fix unhoisting note 2019-06-13 22:45:55 +02:00
zadam
c8049f0efe small fixes 2019-06-12 19:59:52 +02:00
zadam
d713274ae2 link map tweaks 2019-06-11 21:52:00 +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
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
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
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
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
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
93c0469aa0 Merge branch 'stable' 
# Conflicts:
#	src/public/javascripts/dialogs/add_link.js
 2019-05-13 21:42:52 +02:00
zadam
81d10fa605 fix focusing the text editor component after adding a link, closes #523 2019-05-13 21:13:04 +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
3ccf553fda initial experiments with tabs 2019-04-30 22:31:12 +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