3052 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
azivner	45fba6d7f8	save sync records even if sync isn't configured, but don't put them as outstanding pushes (should be still available for pulls)	2017-12-14 07:57:31 -05:00
azivner	180a7432ca	Merge branch 'master' into stable	2017-12-13 23:36:02 -05:00
azivner	eccab914be	version 0.0.3	2017-12-13 23:35:51 -05:00
azivner	55bf903623	fix storing date_modified for note	2017-12-13 23:27:02 -05:00
azivner	b0cbe91784	implementation of forcing full (re)sync	2017-12-13 23:03:48 -05:00
azivner	e6686c4b32	not deleting recent notes because it causes sync hash failures (cleanup is not triggered if server isn't used)	2017-12-13 20:52:33 -05:00
azivner	17c90262c2	create sync records only if sync is configured. This will prevent sync conflicts after document fork.	2017-12-13 20:34:21 -05:00
azivner	2fa57b79fd	Merge branch 'master' into stable	2017-12-12 23:57:40 -05:00
azivner	b7ffc33c94	0.0.2 version	2017-12-12 23:57:26 -05:00
azivner	643069e8d6	sync check failure is now shown as error message in frontend	2017-12-12 23:47:17 -05:00
azivner	64e8777ed5	small clarification of the sync logs	2017-12-12 23:39:02 -05:00
azivner	f71d71104a	set db as ready only if migration fully succeeded	2017-12-12 23:35:41 -05:00
azivner	513689b175	fix	2017-12-12 22:26:40 -05:00
azivner	4596d56ae8	fix bug causing non-working autocomplete after creating new note	2017-12-12 22:20:03 -05:00
azivner	c24d9a0afa	added search for electron + sourcemap for jquery	2017-12-12 21:40:55 -05:00
azivner	bdeaa2829d	added doc folder	2017-12-10 23:21:47 -05:00
azivner	fa8b5d41dd	update schema	2017-12-10 22:16:20 -05:00
azivner	da9b3c420e	Merge remote-tracking branch 'origin/master'	2017-12-10 21:46:25 -05:00
azivner	d025b2b3fb	using space-around instead of space-evenly for tree actions because that one is supported in Chrome 59 used in electron	2017-12-10 21:46:12 -05:00
zadam	1aca42979e	licensing under AGPL v3	2017-12-10 21:13:39 -05:00
azivner	8a3ea412f9	use protect/unprotect terminology in button	2017-12-10 15:47:21 -05:00
azivner	f68ffe1581	fixes for dates in sync	2017-12-10 15:45:17 -05:00
azivner	cba457bd61	using ISO8601 format instead of custom	2017-12-10 15:31:43 -05:00
azivner	021f02bd8c	converted all timestamps to string representation	2017-12-10 12:56:59 -05:00
azivner	e3b708c322	expanding server request timeout for long tree requests	2017-12-10 00:02:13 -05:00
azivner	2fdd4c37e5	using change event instead of changesDone because the latter seems to trigger also on e.g. just selection	2017-12-09 21:56:48 -05:00
azivner	7483f11d10	more consistent handling of tree data structures when creating new note	2017-12-09 21:53:21 -05:00
azivner	3abbe2d970	realoding tree after deletion (too many changes in data model)	2017-12-09 21:42:22 -05:00
azivner	f55f0a4ed3	make sure entity IDs are generated only with alphanumeric characters (base62)	2017-12-09 20:44:06 -05:00
azivner	372cce8f8e	fixed "add date" for ckeditor	2017-12-09 14:17:03 -05:00
azivner	5001e7e630	removed summernote	2017-12-09 14:12:56 -05:00
azivner	d2a5921489	add links in ckeditor	2017-12-09 14:11:35 -05:00
azivner	7ca043ebc6	Merge branch 'master' into ckeditor	2017-12-09 11:56:36 -05:00
azivner	4187ff36fb	generating all IDs with secure method (important now since it's used as salt for encryption)	2017-12-07 22:57:39 -05:00
azivner	b81f1ed93a	fix saving history for encrypted notes	2017-12-06 23:39:43 -05:00
azivner	6fad30e9af	renamed start_note_tree_id option to startNotePath	2017-12-06 23:15:53 -05:00
azivner	f1256423ac	fix handling of note history - when saving note history we save previous state, not current	2017-12-06 22:31:28 -05:00
azivner	4f47c4d6e9	better fix for migration in electron + electron upgrade to 1.8.2 beta 3	2017-12-06 21:15:46 -05:00
azivner	bbd1774815	fix migration in electron build	2017-12-06 20:58:59 -05:00
azivner	d467fbdff3	better styling of parent list	2017-12-06 20:19:41 -05:00
azivner	0c6521545a	fix for cloned notes at root level + better logging	2017-12-06 20:11:45 -05:00
azivner	a0bbd8c853	throwException instead of throwing exceptions manually (includes stacktrace)	2017-12-06 19:53:23 -05:00
azivner	a7831ebfcd	log data dir location	2017-12-06 19:42:23 -05:00
azivner	23e8e20d44	border around tree actions	2017-12-04 18:40:18 -05:00
azivner	33ab709209	spacing between action buttons and pointer cursor	2017-12-04 18:21:57 -05:00
azivner	3789ead2da	creating new starting page when creating database	2017-12-04 00:17:08 -05:00
azivner	6546548848	implemented initial setup of the app	2017-12-03 22:29:23 -05:00
azivner	a3f57622ff	distinguishing between when DB is just connected and when it's ready for queries (validated)	2017-12-03 19:18:33 -05:00
azivner	502e5cbbdf	Merge branch 'master' into ckeditor	2017-12-03 17:47:40 -05:00
azivner	3a26054619	fixes to recent changes	2017-12-03 17:46:56 -05:00