2972 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	14001f67d8	fix updating note title when switching to another note	2017-11-28 19:38:33 -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	4d95eb0762	some fixes in note moving	2017-11-28 15:17:11 -05:00
azivner	0cab4e3edd	CTRL-C CTRL-V now clones the note	2017-11-28 11:36:32 -05:00
azivner	7038636d2e	fix setting title	2017-11-28 10:17:30 -05:00
azivner	40a522a9aa	alt-l shouldn't bring up edit tree prefix dialog	2017-11-27 18:19:04 -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	37a105db4d	fix prefix when renaming note	2017-11-26 22:40:14 -05:00
azivner	160c1c455c	initial implementation of tree prefix	2017-11-26 22:34:25 -05:00
azivner	b4e6245f7b	fix	2017-11-26 21:00:42 -05:00
azivner	9fcafe44d5	fix	2017-11-26 19:56:08 -05:00
azivner	a92df38479	tweaks to time values	2017-11-26 17:04:18 -05:00
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