64 commits

Author	SHA1	Message	Date
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