20563 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
azivner	471f7c669d	encryption of note history if the note is encrypted	2017-11-02 23:36:58 -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
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	c5f80051ae	backup is now triggered after start of the app and with timer	2017-10-28 12:23:11 -04:00
azivner	94a0f3e041	cleanup up config sample to only sync, nothing else is used	2017-10-28 12:18:46 -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	297da47b34	fix sync of audit log	2017-10-26 21:53:26 -04:00
azivner	791314ba1a	push sync	2017-10-26 21:16:21 -04:00
azivner	9cef647811	fixed setting last_synced_pull	2017-10-26 20:54:10 -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	18d23af01a	fix the unhandled rejection logging to lock stack trace	2017-10-26 19:16:36 -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	b4bb1b539e	logging stuff to rotated files through simple-node-logger	2017-10-24 22:04:52 -04:00
azivner	11bfae4007	fixed primary keys, added indexes	2017-10-24 20:00:54 -04:00
azivner	d1981eb6c3	note history snapshots now have date from and date to	2017-10-24 19:36:37 -04:00
azivner	11bbf9e633	fix formatting of date/time	2017-10-24 18:57:00 -04:00
azivner	f089a0d7c3	cleanup of options	2017-10-23 23:41:43 -04:00
azivner	10b94f3a7d	store session secret in file	2017-10-23 23:38:52 -04:00
azivner	2df7940392	all user files are now stored in one directory, by default trilium-data in users home directory	2017-10-23 23:30:23 -04:00
azivner	4409485ca1	store trilium sessions in default OS temp directory	2017-10-23 22:36:18 -04:00
azivner	b9de810c69	remove max-width on layout to allow more natural design in electron	2017-10-23 19:03:29 -04:00
azivner	a5020719e4	fixed adding new note	2017-10-23 19:01:37 -04:00
azivner	a5bd4c7b6a	added date_modified to notes_tree	2017-10-22 22:56:42 -04:00