86 commits

Author	SHA1	Message	Date
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	7e3fd2f63e	added app and db versions to about dialog in settings	2017-11-16 20:03:44 -05:00
azivner	fed1cab2c9	F5 now reloads and ctrl-shift-i shows up dev tools	2017-11-16 19:43:34 -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	2533b8e121	use native node crypto for sha256	2017-11-15 18:23:19 -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	82614c1c73	fix build script	2017-11-13 23:41:44 -05:00
azivner	fbce84e779	added build date & revision	2017-11-13 23:35:23 -05:00
azivner	f9056c6754	proxy support	2017-11-13 19:45:13 -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	5d5ea6a5c2	configurable sync timeout	2017-11-09 20:06:33 -05:00
azivner	4efa00f36b	cosmetic cleanup, mostly in encryption	2017-11-08 22:33:08 -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	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	ba24281f22	fixed bug where migrations were not processed sequentially	2017-11-05 18:59:58 -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	3fb30a0b5c	persisted recent notes	2017-11-04 23:46:50 -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	4073f6a967	removed ID from options, opt_name is now new primary key	2017-11-02 23:02:35 -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