3454 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
azivner	abb122e2a9	websocket reconnection	2017-11-26 13:22:26 -05:00
azivner	3a30aba42b	using bootstrap notify for notifications	2017-11-26 12:56:07 -05:00
azivner	3e6acb17cc	sync WS message is now kind of ping - if there's no ping from server we display error message	2017-11-26 08:24:27 -05:00
azivner	8766e9ae4a	cleanup of status code	2017-11-25 18:38:29 -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	f799d3076b	sync / transaction fixes for recent notes	2017-11-24 00:09:53 -05:00
azivner	1a36daa088	sync fixes	2017-11-23 23:54:54 -05:00
azivner	f499872809	fix sync API for note tree	2017-11-23 22:25:39 -05:00
azivner	c9ccf797da	cycle check when cloning notes	2017-11-23 21:50:12 -05:00
azivner	c72e5ef93b	moved search into separate file	2017-11-23 21:10:37 -05:00
azivner	5b2c18dab7	refactoring and check for existing clone in a parent	2017-11-23 20:49:24 -05:00
azivner	45a293e25a	simplification of prepareNoteTreeInner	2017-11-23 20:12:39 -05:00
azivner	f6aae68063	moved isNewNoteCreated into note_editor	2017-11-23 19:40:47 -05:00
azivner	0ec6d4baa8	simplification of internal structure/methods in note_tree	2017-11-23 19:29:25 -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	b96e434345	fixing encrypt / decrypt subtree	2017-11-22 20:46:42 -05:00
azivner	705aff93ec	fix undefined variable	2017-11-22 20:36:07 -05:00
azivner	ab433b472e	fix broken sending expanded to server	2017-11-22 20:29:22 -05:00
azivner	16818e7583	correctly updating title for all clone nodes	2017-11-22 19:58:56 -05:00
azivner	4e0d83e9de	basic ExtClones integration. Other "clones" are now marked as bold when their clone is activated	2017-11-22 19:40:06 -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	d7644de666	tree now shows list of different cloned notes	2017-11-21 20:04:06 -05:00
azivner	84a9e9067d	notes with multiple parents are now marked with dashed underline	2017-11-21 18:39:56 -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	34b13c7936	electron shortcuts fixes	2017-11-20 23:10:04 -05:00
azivner	a61f63b098	load port from config file for electron	2017-11-20 19:59:42 -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	aeeb35101e	fixed recent changes	2017-11-19 22:48:07 -05:00
azivner	8a1c477b8a	removed glob.allNoteIds which wasn't used anymore	2017-11-19 22:32:59 -05:00
azivner	d98a5b6299	more actions on jump to note dialog	2017-11-19 22:31:30 -05:00
azivner	c8aaf6085d	fixed jump to note	2017-11-19 20:36:13 -05:00
azivner	658f4872af	fixed autocomplete	2017-11-19 19:39: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	14787e0283	note expansion fix	2017-11-19 16:43:49 -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	f18d25911b	removed notes_parent, instead using notes_tree	2017-11-19 11:28:46 -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