sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
349 Commits
21 Branches
339 Tags
369 MiB
Commit Graph

71 Commits (c4a9aaa52d5b8708ccb72fbb95ea5ab01ac26edb)

Author SHA1 Message Date
azivner e53926738c sync fixes 2017-11-16 22:18:25 +07: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 +07:00
azivner 7e3fd2f63e added app and db versions to about dialog in settings 2017-11-16 20:03:44 +07:00
azivner 379431eefd fixed encryption of note history 2017-11-16 00:22:00 +07:00
azivner c190c738a2 data key is not encrypted with aes-cbc as well 2017-11-15 23:39:50 +07:00
azivner 5313ac47e6 changing from AES-256-CTR to AES-128-CBC for note encryption 2017-11-15 22:13:45 +07:00
azivner 9cf935efd1 protect/unprotect subtree 2017-11-15 00:04:26 +07:00
azivner 892aa39d46 renamed encryption session timeout to protected session timeout 2017-11-14 22:44:45 +07:00
azivner 0a0421ec7e note history decryption now works, more cleanup 2017-11-14 22:21:56 +07: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 +07:00
azivner c18799b938 Merge branch 'stable' 2017-11-13 23:42:23 +07:00
azivner fbce84e779 added build date & revision 2017-11-13 23:35:23 +07:00
azivner 50b789fc39 server side encryption WIP 2017-11-12 21:40:26 +07:00
azivner ec49bf0cca server side encryption WIP 2017-11-10 22:55:19 +07:00
azivner 8f1eedfe0d refactoring of password change and preparations for server side encryption 2017-11-09 23:25:23 +07: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 +07:00
azivner a3b2e705ce refactoring of sync code 2017-11-09 20:52:47 +07:00
azivner 70f717b350 note expansion is not synced anymore so there's less possibility of conflict 2017-11-07 20:36:17 +07:00
azivner a73afa9ded fix password change 2017-11-06 19:48:02 +07:00
azivner e1251222cc sync fix and more logging 2017-11-06 19:23:35 +07:00
azivner 2a9a8da045 sync fixes 2017-11-05 20:37:25 +07:00
azivner 0481b1b79c more granular detection of changes which forces less disruptive realoding. Refactoring of audit functions 2017-11-05 10:41:54 +07:00
azivner ae23f2ea84 added sync for recent notes 2017-11-05 00:16:02 +07:00
azivner 3fb30a0b5c persisted recent notes 2017-11-04 23:46:50 +07:00
azivner 68c2edea45 better reporting of sync error when "sync now" 2017-11-04 21:21:09 +07: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 +07:00
azivner 9c88fc6060 encryption settings loading moved from tree to encryption module 2017-11-04 19:57:40 +07:00
azivner 869bccea18 event log now shows full path of notes and works with encryption 2017-11-04 11:44:42 +07:00
azivner 3892666961 added event log dialog 2017-11-03 23:00:35 +07:00
azivner e35c2dd4ad event_log - entity and logging sync info 2017-11-03 22:08:27 +07:00
azivner cf45594d89 don't alert in case of updated note in current editor 2017-11-03 20:50:48 +07:00
azivner ac0e5ada6e also de-encryption of note history plus bug fixes 2017-11-02 23:55:22 +07:00
azivner 471f7c669d encryption of note history if the note is encrypted 2017-11-02 23:36:58 +07:00
azivner a7f95e95e9 proper syncing of note positions 2017-11-02 22:55:22 +07:00
azivner c3d776ae13 sync of options 2017-11-02 20:48:02 +07:00
azivner 9e3515b122 fixed sync bug 2017-11-01 23:39:17 +07:00
azivner a5735961a4 don't push changes to server which have been pulled from it 2017-11-01 23:16:21 +07: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 +07:00
azivner 962c078bbc number of sync changes to push next to "sync now" button 2017-11-01 20:31:44 +07:00
azivner 72905a9854 sync cleanup 2017-11-01 00:47:39 +07:00
azivner 7af6b69331 sync fixes 2017-10-31 20:44:32 +07:00
azivner 0df7b0bfcf sync fixes 2017-10-31 20:09:07 +07:00
azivner 15abee3ed0 incremental pull implementation 2017-10-31 19:34:58 +07:00
azivner 43940f1140 added sourceId to sync, fixes to sync etc. 2017-10-31 00:15:49 +07:00
azivner 8630b3685d incremental push sync 2017-10-29 22:22:30 +07:00
azivner de3d1b3e39 better transaction handling with rollback on exception 2017-10-29 18:50:28 +07:00
azivner af13b28cab fixes for sync 2017-10-29 14:55:48 +07:00
azivner d613200925 "sync now" button 2017-10-29 11:22:41 +07:00
azivner c28b7775a5 API auth (untested) 2017-10-28 22:17:00 +07:00
azivner eb6f9f8f81 added document_secret as basis for API authentication 2017-10-28 19:55:55 +07:00