zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-30 04:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2091 commits 38 branches 306 tags 138 MiB
Commit graph

756 commits

Author SHA1 Message Date
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 c6806256fd import doesn't need a full tree reload 2019-03-31 19:13:17 +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 66e2a12f3d rename "current" to "active" based on recent refactorings 2019-03-30 10:15:19 +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 a5fc8d5329 moved libraries and images out of src folder 2019-03-30 09:39:58 +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 d66ad4319e fix focused table cell background color, closes #458 2019-03-24 20:16:05 +01:00
zadam 251fcaeb48 support for superscript and subscript, closes #462 2019-03-24 19:58:13 +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 0d0464549f notes are now created with correct local dates 2019-03-13 22:43:59 +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 1c41d459f0 renamed dates in code as well 2019-03-12 20:58:31 +01:00
zadam 05374becfd Merge branch 'master' into dev31 2019-03-10 10:11:01 +01:00
zadam 37d2a7939c fix background/border on quick help dialog, closes #440 2019-03-09 18:57:21 +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 ecbaffa5f3 return focus back to note detail after quitting add link dialog 2019-03-07 20:45:32 +01:00
zadam 8ed6851e85 fix image upload for ckeditor v12 2019-03-04 22:58:47 +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 9703fd61e2 protected note's shield background now looks better on the dark themes 2019-03-04 20:53:57 +01:00
zadam b5283d58bb nicer underlining under tooltip items 2019-02-28 22:32:54 +01:00
zadam 9f30d4e673 fix image caption editing (#422) 2019-02-26 22:59:38 +01:00
zadam 8e0d1fa0df better contrast of links on the dark theme 2019-02-26 22:51:33 +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 51bbc10744 switchable image shrinking 2019-02-24 12:24:28 +01:00
zadam fb5df33ee7 new import options in the dialog, tooltips 2019-02-24 11:36:01 +01:00
zadam d8ba0ccd7d use formdata to pass text arguments during import instead of request path 2019-02-24 09:56:00 +01:00
zadam 886ea6c68c allow import of multiple files at the same time 2019-02-24 09:34:50 +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 a7fce33750 OPML v2 export 2019-02-16 23:58:42 +01:00
zadam 6fd8e73150 UI for export of OPML v2, WIP 2019-02-16 23:33:40 +01:00
zadam 1359dd86c2 OPML 2 import, closes #298, #286 2019-02-16 22:13:29 +01:00
zadam a1b610fc50 full screen help dialog 2019-02-16 19:42:58 +01:00
zadam c849d719e9 styling for external links 2019-02-16 18:49:57 +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 dad47d115f fixes for SQL console schema view 2019-02-13 23:27:00 +01:00
zadam 502026359c help page, closes #273 2019-02-13 23:06:11 +01:00
zadam 4c2e12d2cb upgrade to bootstrap 4.3.0 2019-02-12 20:26:28 +01:00
zadam 14f7a8b7b9 safe import implementation 2019-02-11 23:45:58 +01:00
zadam caa7dd9619 prettier progress count 2019-02-10 22:56:14 +01:00
zadam 8aa7e2d0a0 fixes in opml export and note content loading 2019-02-10 22:45:44 +01:00
zadam 6be8a3f343 added progress also to export 2019-02-10 22:30:55 +01:00
zadam a097cefba7 import error handling 2019-02-10 19:53:57 +01:00
zadam e4c78f3887 added ImportContext 2019-02-10 19:36:03 +01:00
zadam 5baa251944 more changes to import reporting through WS 2019-02-10 16:59:50 +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 e04f1cd574 help button with no help dialog yet 2019-02-09 19:48:19 +01:00
zadam 176c3a5d51 added dev tools to global menu 2019-02-09 19:25:55 +01:00
zadam c09570cf39 global menu 2019-02-09 19:17:16 +01:00
zadam 6952b643ae note content refactoring, WIP 2019-02-07 22:16:40 +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 bad7b84993 error handling in custom request handler 2019-02-03 11:15:32 +01:00
zadam d3ca6b5ae6 styling for scrollbar which looks ugly otherwise in dark themes 2019-02-03 10:21:28 +01:00
zadam da5009f089 main border color CSS variable 2019-02-03 10:09:59 +01:00
zadam c08524c977 fix CSS class of user theme 2019-02-03 00:12:57 +01:00
zadam f89537037e small styling fixes 2019-02-02 23:51:00 +01:00
zadam c153793766 added CSS variable for disabled button background 2019-02-02 23:26:39 +01:00
zadam 8aea9a1801 added font family CSS variables to theming API 2019-02-02 20:45:38 +01:00
jkurei 6695e8b011 Better icon for iOS' homescreen 2019-01-28 22:48:01 +01:00