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

156 commits

Author SHA1 Message Date
azivner 6546548848 implemented initial setup of the app 2017-12-03 22:29:23 -05:00
azivner 3a26054619 fixes to recent changes 2017-12-03 17:46:56 -05:00
azivner 15faefe8a3 recent notes are now keyed by note tree id which simplifies things 2017-12-03 10:06:53 -05:00
azivner 41f089b3f4 pretty printing HTML output (for nice git diffs) 2017-12-03 09:19:48 -05:00
azivner ddd216c92e export with pos in filename and import so we preserve note order 2017-12-03 00:10:43 -05:00
azivner cd3c6d7e3b note import from directory 2017-12-02 23:41:18 -05:00
azivner 119d085856 export subtree to filesystem 2017-12-02 21:48:22 -05:00
azivner 0521deb304 unifying API paths to lower-case 2017-12-01 22:47:23 -05:00
azivner 471821ebe5 separated electron routing into separate file 2017-11-30 20:51:35 -05:00
azivner 8bd76721ad prefixes are now displayed also in all autocompletes and recent notes 2017-11-29 22:03:03 -05:00
azivner e6629b2c93 cosmetic sync related changes 2017-11-29 21:04:30 -05:00
azivner 3386cd790e cleaned up images and links which are not used nor supported 2017-11-29 20:47:01 -05:00
azivner e47027cbef recent notes are kept only for one day 2017-11-29 20:30:47 -05:00
azivner 3d84f5c3b0 synchronization of transactions using promise so only one can be active 2017-11-28 17:24:08 -05:00
azivner fd764f6163 separate DB connection for each transaction (just for the record, will be reverted probably) 2017-11-28 17:04:47 -05:00
azivner 8b5988e13c sync fix to prefix and some usability improvements 2017-11-26 23:10:23 -05:00
azivner 160c1c455c initial implementation of tree prefix 2017-11-26 22:34:25 -05:00
azivner 8766e9ae4a cleanup of status code 2017-11-25 18:38:29 -05:00
azivner f433b30089 removed audit_log 2017-11-24 20:51:44 -05:00
azivner f799d3076b sync / transaction fixes for recent notes 2017-11-24 00:09:53 -05:00
azivner f499872809 fix sync API for note tree 2017-11-23 22:25:39 -05:00
azivner c9ccf797da cycle check when cloning notes 2017-11-23 21:50:12 -05:00
azivner 5b2c18dab7 refactoring and check for existing clone in a parent 2017-11-23 20:49:24 -05:00
azivner acba72ec4c cloning in context menu (copy & paste) and a lot of related refactoring and fixes 2017-11-22 23:16:54 -05:00
azivner 79a803ccc9 added content hash check 2017-11-21 22:11:27 -05:00
azivner 163a03663f app info is now logged after startup 2017-11-21 00:25:53 -05:00
azivner a3030f845b unified SQL syntax to uppercase 2017-11-20 23:51:28 -05:00
azivner 4c0315d2bf fix deleting notes 2017-11-19 23:12:39 -05:00
azivner e992087720 recovery if note path changes, plus change of note path after note move 2017-11-19 18:16:50 -05:00
azivner 3610926804 adding clone from recent notes dialog 2017-11-19 16:35:35 -05:00
azivner 00151beded fixed recent notes 2017-11-19 12:06:48 -05:00
azivner f18d25911b removed notes_parent, instead using notes_tree 2017-11-19 11:28:46 -05:00
azivner cc3c9d6428 parent-child relationship is now stored in notes_parent table 2017-11-18 18:57:50 -05:00
azivner 9a819cafed sync changes for note_tree_id and fixed recent notes 2017-11-18 17:17:46 -05:00
azivner 5fb94fcbbd notes_tree now has note_tree_id so we stricly distinguish between working on notes or note trees 2017-11-18 17:05:50 -05:00
azivner dec9cad106 cleaned up "CBC" from methods since we don't have CTR 2017-11-18 12:53:17 -05:00
azivner 7b2c79b754 lazy loading of tree 2017-11-17 21:31:54 -05:00
azivner e53926738c sync fixes 2017-11-16 22:18:25 -05:00
azivner b2d1ca1c28 we now remember past source ids so app restart won't change anything in sync operation 2017-11-16 21:50:00 -05:00
azivner 7e3fd2f63e added app and db versions to about dialog in settings 2017-11-16 20:03:44 -05:00
azivner 379431eefd fixed encryption of note history 2017-11-16 00:22:00 -05:00
azivner c190c738a2 data key is not encrypted with aes-cbc as well 2017-11-15 23:39:50 -05:00
azivner 5313ac47e6 changing from AES-256-CTR to AES-128-CBC for note encryption 2017-11-15 22:13:45 -05:00
azivner 9cf935efd1 protect/unprotect subtree 2017-11-15 00:04:26 -05:00
azivner 892aa39d46 renamed encryption session timeout to protected session timeout 2017-11-14 22:44:45 -05:00
azivner 0a0421ec7e note history decryption now works, more cleanup 2017-11-14 22:21:56 -05:00
azivner ff411f00b1 server side WIP - saving encrypted note now works, changing terminology of "encrypted note" to "protected note" 2017-11-14 21:54:12 -05:00
azivner c18799b938 Merge branch 'stable' 2017-11-13 23:42:23 -05:00
azivner fbce84e779 added build date & revision 2017-11-13 23:35:23 -05:00
azivner 50b789fc39 server side encryption WIP 2017-11-12 21:40:26 -05:00
azivner ec49bf0cca server side encryption WIP 2017-11-10 22:55:19 -05:00
azivner 8f1eedfe0d refactoring of password change and preparations for server side encryption 2017-11-09 23:25:23 -05:00
azivner 433982e7bc - changing note parent must change date_modified otherwise it will trigger a conflict 
- when syncing note tree we don't overwrite is_expanded status
 2017-11-09 21:11:33 -05:00
azivner a3b2e705ce refactoring of sync code 2017-11-09 20:52:47 -05:00
azivner 70f717b350 note expansion is not synced anymore so there's less possibility of conflict 2017-11-07 20:36:17 -05:00
azivner a73afa9ded fix password change 2017-11-06 19:48:02 -05:00
azivner e1251222cc sync fix and more logging 2017-11-06 19:23:35 -05:00
azivner 2a9a8da045 sync fixes 2017-11-05 20:37:25 -05:00
azivner 0481b1b79c more granular detection of changes which forces less disruptive realoding. Refactoring of audit functions 2017-11-05 10:41:54 -05:00
azivner ae23f2ea84 added sync for recent notes 2017-11-05 00:16:02 -04:00
azivner 3fb30a0b5c persisted recent notes 2017-11-04 23:46:50 -04:00
azivner 68c2edea45 better reporting of sync error when "sync now" 2017-11-04 21:21:09 -04:00
azivner b192336113 fixed unloading the encrypted page after encryption timeout by simply reloading the app completely plus some unrelated refactorings 2017-11-04 21:02:56 -04:00
azivner 9c88fc6060 encryption settings loading moved from tree to encryption module 2017-11-04 19:57:40 -04:00
azivner 869bccea18 event log now shows full path of notes and works with encryption 2017-11-04 11:44:42 -04:00
azivner 3892666961 added event log dialog 2017-11-03 23:00:35 -04:00
azivner e35c2dd4ad event_log - entity and logging sync info 2017-11-03 22:08:27 -04:00
azivner cf45594d89 don't alert in case of updated note in current editor 2017-11-03 20:50:48 -04:00
azivner ac0e5ada6e also de-encryption of note history plus bug fixes 2017-11-02 23:55:22 -04:00
azivner 471f7c669d encryption of note history if the note is encrypted 2017-11-02 23:36:58 -04:00
azivner a7f95e95e9 proper syncing of note positions 2017-11-02 22:55:22 -04:00
azivner c3d776ae13 sync of options 2017-11-02 20:48:02 -04:00
azivner 9e3515b122 fixed sync bug 2017-11-01 23:39:17 -04:00
azivner a5735961a4 don't push changes to server which have been pulled from it 2017-11-01 23:16:21 -04:00
azivner 1cf247f164 more fine grained handling of conflicts without having to reload whole page most of the time 2017-11-01 22:36:26 -04:00
azivner 962c078bbc number of sync changes to push next to "sync now" button 2017-11-01 20:31:44 -04:00
azivner 72905a9854 sync cleanup 2017-11-01 00:47:39 -04:00
azivner 7af6b69331 sync fixes 2017-10-31 20:44:32 -04:00
azivner 0df7b0bfcf sync fixes 2017-10-31 20:09:07 -04:00
azivner 15abee3ed0 incremental pull implementation 2017-10-31 19:34:58 -04:00
azivner 43940f1140 added sourceId to sync, fixes to sync etc. 2017-10-31 00:15:49 -04:00
azivner 8630b3685d incremental push sync 2017-10-29 22:22:30 -04:00
azivner de3d1b3e39 better transaction handling with rollback on exception 2017-10-29 18:50:28 -04:00
azivner af13b28cab fixes for sync 2017-10-29 14:55:48 -04:00
azivner d613200925 "sync now" button 2017-10-29 11:22:41 -04:00
azivner c28b7775a5 API auth (untested) 2017-10-28 22:17:00 -04:00
azivner eb6f9f8f81 added document_secret as basis for API authentication 2017-10-28 19:55:55 -04:00
azivner c5f80051ae backup is now triggered after start of the app and with timer 2017-10-28 12:23:11 -04:00
azivner 966ac6f620 shortening of noteIds to 12 characters 2017-10-28 12:12:20 -04:00
azivner a76e82e9a2 trim note_ids to 22 characters (there was a bug in nodejs backend which generated 32 character noteids) 2017-10-28 10:21:55 -04:00
azivner a2f0a372a5 sync fixes etc., push/pull sync is now working in basic form 2017-10-26 23:21:31 -04:00
azivner 791314ba1a push sync 2017-10-26 21:16:21 -04:00
azivner 266727a21b separate sync for pull (implemented) and push (not yet) 2017-10-26 20:31:31 -04:00
azivner f6033705a7 last_synced is now updated after sync is completed 2017-10-26 19:22:21 -04:00
azivner 1c733fbfab sync WIP 2017-10-25 22:39:21 -04:00
azivner 5253f680f6 sync WIP 2017-10-24 23:14:26 -04:00
azivner 5df3b78abc notes_tree is now soft deleted as well 2017-10-24 22:58:59 -04:00
azivner 8e47e34d1f more logging 2017-10-24 22:17:48 -04:00
azivner d1981eb6c3 note history snapshots now have date from and date to 2017-10-24 19:36:37 -04:00
azivner a5020719e4 fixed adding new note 2017-10-23 19:01:37 -04:00