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

808 commits

Author SHA1 Message Date
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 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
zadam e00ab5dbf9 new "iconClass" property on note_short, now together with cssClass respecting template relationship, #707 2019-11-16 08:59:27 +01:00
zadam 4cda661c1b add move to dialog 2019-11-11 22:57:51 +01:00
zadam 77ac8df1e6 keyboard shortcut ctrl+shift+c for "clone to..." dialog 2019-11-10 22:19:22 +01:00
zadam b53e2a3570 clone to notes now has overview of notes to clone and is available from context menu 2019-11-10 22:06:43 +01:00
zadam 7539e6a616 Merge branch 'stable' 
# Conflicts:
#	src/services/consistency_checks.js
 2019-11-10 21:35:11 +01:00
zadam b5a0cadcf4 fix showing up of render note help view if no renderNote relations have been found 2019-11-10 21:34:15 +01:00
zadam b8db842788 added frontend API methods to refresh tabs 2019-11-10 19:34:15 +01:00
zadam 8f2d2b189c Merge branch 'stable' 2019-11-10 11:24:08 +01:00
zadam 0837cabb41 fix module name for prompt dialog, fixes #698 2019-11-10 10:10:49 +01:00
zadam 3a1c80c189 refactoring of legacy js events 2019-11-09 17:45:22 +01:00
zadam 31bcc037f1 refactoring of legacy js events 2019-11-09 17:39:48 +01:00
zadam da92809299 Merge branch 'stable' 2019-11-09 15:33:04 +01:00
zadam c2ebd4b308 show notes in a book including their prefix, closes #695 2019-11-09 15:31:47 +01:00
zadam 7cd75cebfc fix icons in context menu 2019-11-09 13:32:06 +01:00
zadam 664485ccd5 file revisions preview 2019-11-09 13:01:05 +01:00
zadam 60ac1a04f4 uploading new file revisions 2019-11-09 11:58:52 +01:00
zadam 7c7beb5502 added contentLength to note entity 2019-11-09 09:36:08 +01:00
zadam 58a857cf79 note revisions for images, WIP 2019-11-08 23:09:57 +01:00
zadam 712f67e983 uploading new image revisions, WIP 2019-11-08 22:34:30 +01:00
zadam 3149dff880 Merge branch 'stable' 2019-11-08 19:11:18 +01:00
zadam d58e98e361 fix not being able to rename a note when in auto-book mode, closes #694 2019-11-07 23:25:58 +01:00
zadam 744855d4f5 linking notes through CKEditor mentiones 2019-11-07 22:43:01 +01:00
zadam 894c888d87 including ckeditor mentions plugin for easy linking 2019-11-06 22:58:32 +01:00
zadam 34d4274032 separate cloning dialog 2019-11-05 23:11:25 +01:00
zadam d87c469fbb Merge branch 'stable' 2019-11-05 22:28:27 +01:00
zadam 72fda89360 fix loading of the search note results 2019-11-05 21:47:22 +01:00
zadam 7075842954 expose bindGlobalShortcut to frontend script API 2019-11-05 21:26:54 +01:00
zadam a2c78e2c5c disabling link map animation, closes #684 2019-11-05 20:59:20 +01:00
zadam 9c9ef1c7b4 added more careful handling of search note operations, fixes #683 2019-11-04 22:41:06 +01:00
zadam df40accdd4 fix bug when context menu sometimes does not show up, closes #682 2019-11-04 20:20:21 +01:00
zadam b67aa99b86 small fixes in context menu item visibility 2019-11-04 19:37:03 +01:00
zadam fcb6a06d68 fix refreshing notes after import / delete 
(cherry picked from commit 5b5ab0b044)
 2019-11-03 18:34:07 +01:00
zadam 5b5ab0b044 fix refreshing notes after import / delete 2019-11-03 18:33:43 +01:00
zadam fc87bcf10c using boxicons instead of jam icons WIP 2019-11-02 12:17:00 +01:00
zadam b471d51cb4 reloading of notes in tree cache when attribute changes 2019-11-02 08:04:22 +01:00
zadam 2e58e32112 note revision sync and other fixes 2019-11-01 20:00:56 +01:00
zadam 1a182d1b58 final fix for the ws issue 2019-10-30 19:43:17 +01:00
zadam 68faa47c6f fix not sending latest syncs to client 2019-10-29 20:19:28 +01:00
zadam d50e072ea4 fix not-updating lastSyncId in ws handler 2019-10-29 19:03:39 +01:00
zadam 904eb25f64 fix persistent toasts lingering after disposal in DOM 2019-10-29 18:59:56 +01:00
zadam 205081c804 actual fix for the not disappearing toasts 2019-10-28 20:44:11 +01:00
zadam c4d5060a0b fix non disappearing persistent toast 2019-10-28 20:26:40 +01:00
zadam 5bba18191f small fixes 2019-10-28 19:45:36 +01:00
zadam b7344329f4 date note fixes 2019-10-27 22:13:38 +01:00
zadam e04845335b fixed search notes with new treecache 2019-10-27 19:17:32 +01:00
zadam 86a330c8c3 delete notes are now in cache as well which allows simplified update of the tree after deletion 2019-10-26 22:50:46 +02:00
zadam bdf42749f3 fixes 2019-10-26 20:48:56 +02:00
zadam c0b30e603a updated API docs 2019-10-26 10:00:26 +02:00
zadam d3c957768f branches in tree cache should always be loaded if some branchId reference exists 2019-10-26 09:58:00 +02:00
zadam ed9ecf2a57 simplification of tree cache 2019-10-26 09:51:08 +02:00
zadam 22d48b0586 sync update persistent notification 2019-10-25 22:20:14 +02:00
zadam c72ea2ed60 changes in retrieval of initial note tree and then updates 2019-10-25 21:47:14 +02:00
zadam 4570319517 WS debugging messages and small changes 2019-10-24 23:02:29 +02:00
zadam ec7c0f0723 added sync mutex to ping messages 2019-10-22 21:59:51 +02:00
zadam 3de124748d fix a bug where render note content could be set to null during renaming 2019-10-21 22:56:43 +02:00
zadam 132360b46b expose note hoisting to frontend API, closes #663 2019-10-21 21:22:53 +02:00
zadam 2a5ab3a5e1 script can wait until the sync data has been applied 2019-10-20 17:49:58 +02:00
zadam 358fd13c8d small refactorings 2019-10-20 13:09:00 +02:00
zadam 2305ad7405 reloading notes after script changes 2019-10-20 12:29:34 +02:00
zadam 78f5b7b288 rename info service to toast service 2019-10-20 10:00:18 +02:00
zadam 1903c59163 scripts should have different sourceId 2019-10-19 15:12:25 +02:00
zadam b16c2d19b6 duplicate (single) note 2019-10-19 12:36:16 +02:00
zadam 00bb1236ce protect/unprotect tree reports progress via notifications 2019-10-19 09:58:18 +02:00
zadam 82bbf4173b fixes to delete notifications 2019-10-19 00:11:07 +02:00
zadam 9f4ca279aa delete progress 2019-10-18 23:19:16 +02:00
zadam b890859025 further refactoring of export notifications 2019-10-18 22:44:03 +02:00
zadam 21588829c7 correctly use taskId in toasts 2019-10-17 21:15:27 +02:00
zadam 9689029c4b ImportContext generalized to TaskContext 2019-10-17 21:11:35 +02:00
zadam 992d174b23 import uses persistent toasts 2019-10-17 20:44:51 +02:00
zadam 8886e95847 replaced bootstrap-notify.min.js with bootstrap toasts 2019-10-17 20:03:05 +02:00
zadam 6d5762fac8 open update to 7.0 2019-10-16 19:42:42 +02:00
zadam 1b318d6a30 fix tab cleanup 2019-10-15 19:42:39 +02:00
zadam 22c4859d42 grey out archived items in the tree 2019-10-15 19:16:44 +02:00
zadam fafab95a07 auto-book has variable number of columns based on the right pane width 2019-10-14 12:06:10 +02:00
zadam 1923bf7dda added some basic book examples to demo document 2019-10-14 11:15:38 +02:00
zadam 2ee94a3a69 changed import progress notification so it shows up for drag & drop as well 2019-10-14 10:31:58 +02:00
zadam 0b43eceb2d Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2019-10-10 21:26:57 +02:00
zadam 85f736139b fix opening note revisions from the sidebar 2019-10-10 20:00:06 +02:00
zadam 98a6670cb4 prevent default context menu on tab right click, closes #656 2019-10-10 19:34:55 +02:00
zadam 0835930a8a fix creating child in relation map, closes #655 2019-10-09 23:04:01 +02:00
zadam c1e8a4b384 spell check support + small options tabs reorganization 2019-10-06 21:35:26 +02:00
zadam 8859e2ac40 fix opening links from book 2019-10-06 12:33:47 +02:00
zadam 7423b2f4fd book handling of protected notes 2019-10-06 11:21:12 +02:00
zadam 516277a478 added "auto book" displayed on the empty text pages as a replacement for children overview 2019-10-05 20:27:30 +02:00
zadam cbc7710d81 removed children overview (will be replaced by book) 2019-10-05 12:06:06 +02:00
zadam ea71e96f72 ability to set book zoom level via label 2019-10-05 12:01:00 +02:00
zadam 59d1cb1833 expand all children button 2019-10-05 11:22:42 +02:00
zadam 7c54ba63ce render notes in book 2019-10-05 10:55:29 +02:00
zadam 5892b5b851 nested note rendering in book 2019-10-05 09:33:31 +02:00
zadam 02eb737b9d book has now zoom 2019-10-04 22:21:14 +02:00
zadam dec2c218f7 basic book rendering of code and image notes 2019-10-02 19:40:22 +02:00
zadam 35e825b376 fix tooltips 2019-10-01 21:41:20 +02:00