278 commits

Author	SHA1	Message	Date
azivner	7bdf269095	migration now works also in electron	2017-11-30 19:58:00 -05:00
azivner	d0a0366b05	more complete support for network-less electron frontend-backend communication including protected session	2017-11-29 23:30:35 -05:00
azivner	e6629b2c93	cosmetic sync related changes	2017-11-29 21:04:30 -05:00
azivner	6d603eda86	drop links and images tables	2017-11-29 20:48:58 -05:00
azivner	3386cd790e	cleaned up images and links which are not used nor supported	2017-11-29 20:47:01 -05:00
azivner	d019d0a690	Merge branch 'master' into stable	2017-11-29 20:30:56 -05:00
azivner	e47027cbef	recent notes are kept only for one day	2017-11-29 20:30:47 -05:00
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	cd90200272	fixed sync	2017-11-28 18:33:23 -05:00
azivner	91c2f9e7cb	websocket stuff separated into messaging.js	2017-11-28 17:52:47 -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	b809971fd1	using dotted underlining for cloned notes because dashed looks ugly in chrome	2017-11-27 18:16:42 -05:00
azivner	1231e02449	show 0 changes to sync for instances without configured sync	2017-11-26 23:16:47 -05:00
azivner	8b5988e13c	sync fix to prefix and some usability improvements	2017-11-26 23:10:23 -05:00
azivner	160c1c455c	initial implementation of tree prefix	2017-11-26 22:34:25 -05:00
azivner	cb31e0acf2	broadcast messages to all clients, send also number of outstanding syncs	2017-11-25 18:31:38 -05:00
azivner	992238f0b3	websocket reimplementation of status requests	2017-11-25 17:43:05 -05:00
azivner	f433b30089	removed audit_log	2017-11-24 20:51:44 -05:00
azivner	1a36daa088	sync fixes	2017-11-23 23:54:54 -05:00
azivner	acba72ec4c	cloning in context menu (copy & paste) and a lot of related refactoring and fixes	2017-11-22 23:16:54 -05:00
azivner	c1fca4764b	fixed password change (broken since migration to CBC encryption)	2017-11-22 20:57:06 -05:00
azivner	705aff93ec	fix undefined variable	2017-11-22 20:36:07 -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	163a03663f	app info is now logged after startup	2017-11-21 00:25:53 -05:00
azivner	a3030f845b	unified SQL syntax to uppercase	2017-11-20 23:51:28 -05:00
azivner	51ad89ce63	Merge branch 'stable'	2017-11-20 23:37:27 -05:00
azivner	b998c936ba	don't save backups with colons in filenames, doesn't work on windows	2017-11-20 19:43:48 -05:00
azivner	3a55d08152	don't save backups with colons in filenames, doesn't work on windows	2017-11-20 19:38:30 -05:00
azivner	4c0315d2bf	fix deleting notes	2017-11-19 23:12:39 -05:00
azivner	e992087720	recovery if note path changes, plus change of note path after note move	2017-11-19 18:16:50 -05:00
azivner	3610926804	adding clone from recent notes dialog	2017-11-19 16:35:35 -05:00
azivner	00151beded	fixed recent notes	2017-11-19 12:06:48 -05:00
azivner	b22eb2db1e	support for note path	2017-11-19 08:47:22 -05:00
azivner	cc3c9d6428	parent-child relationship is now stored in notes_parent table	2017-11-18 18:57:50 -05:00
azivner	9a819cafed	sync changes for note_tree_id and fixed recent notes	2017-11-18 17:17:46 -05:00
azivner	5fb94fcbbd	notes_tree now has note_tree_id so we stricly distinguish between working on notes or note trees	2017-11-18 17:05:50 -05:00
azivner	dec9cad106	cleaned up "CBC" from methods since we don't have CTR	2017-11-18 12:53:17 -05:00
azivner	6b226a319c	cleaned up old CTR encryption methods	2017-11-18 12:48:54 -05:00
azivner	2f2969b2a1	all DB operations now wait for DB connection	2017-11-17 19:09:51 -05:00
azivner	c4a9aaa52d	fix error when saving unprotected notes	2017-11-17 18:56:52 -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	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
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	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	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	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	a5bd4c7b6a	added date_modified to notes_tree	2017-10-22 22:56:42 -04:00
azivner	3009c5e15e	notes are now soft-deleted	2017-10-22 22:13:24 -04:00
azivner	1cc75ad385	cleanup columns from notes table	2017-10-22 21:05:01 -04:00
azivner	14625cc613	more fixes to migration	2017-10-22 20:29:31 -04:00
azivner	06328929ec	fix migration + cleanup unused Notecase tables in migration script	2017-10-22 20:22:09 -04:00
azivner	dcdabe79d1	use strict in all JS files	2017-10-21 21:10:33 -04:00
azivner	0a793d0c47	fixed encryption	2017-10-16 23:18:43 -04:00
azivner	0c823a2927	reorganization of source code	2017-10-15 19:47:05 -04:00