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

58 commits

Author SHA1 Message Date
azivner 54c0ff15b3 using server.method() instead of direct call to $.ajax - preparation for electron without network requests 2017-11-28 20:52:38 -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 1a36daa088 sync fixes 2017-11-23 23:54:54 -05:00
azivner 5cec7a497b fix pulling recent notes by note path (which contains '/' so needs to be escaped) 2017-11-21 22:18:37 -05:00
azivner 79a803ccc9 added content hash check 2017-11-21 22:11:27 -05:00
azivner a3030f845b unified SQL syntax to uppercase 2017-11-20 23:51:28 -05:00
azivner 00151beded fixed recent notes 2017-11-19 12:06:48 -05:00
azivner 9a819cafed sync changes for note_tree_id and fixed recent notes 2017-11-18 17:17:46 -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 9e7fcdfe15 experimental implementation of sync toggle 2017-11-16 20:08:04 -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 f9056c6754 proxy support 2017-11-13 19:45:13 -05:00
azivner 8f1eedfe0d refactoring of password change and preparations for server side encryption 2017-11-09 23:25:23 -05:00
azivner a3b2e705ce refactoring of sync code 2017-11-09 20:52:47 -05:00
azivner 5d5ea6a5c2 configurable sync timeout 2017-11-09 20:06:33 -05:00
azivner 1c501beea9 sync debugging tweaks etc. 2017-11-05 21:56:42 -05:00
azivner 2a9a8da045 sync fixes 2017-11-05 20:37:25 -05:00
azivner b890c9982b some tweaks mainly for electron support 2017-11-05 17:58:55 -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 900f169dab tree changes as a module 2017-11-04 22:10:41 -04:00
azivner 68c2edea45 better reporting of sync error when "sync now" 2017-11-04 21:21:09 -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 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 40e27cd6f7 removed id from notes_history, new primary key is note_history_id 2017-11-02 19:23:52 -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 0e8fcbc0f5 better error handling / logging of sync events 2017-11-01 00:39:07 -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 d88d562d63 created sync table 2017-10-30 18:44:26 -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 afadd6ec06 added date_modified to options as preparation for options syncing 2017-10-29 16:14:59 -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 724f4b43b7 added document_id for sync identification 2017-10-28 13:19:12 -04:00
azivner a2f0a372a5 sync fixes etc., push/pull sync is now working in basic form 2017-10-26 23:21:31 -04:00