20 Commits

Author	SHA1	Message	Date
thecodrr	35995784d9	fix: merge conflict detection when merging via sse	2020-08-25 08:52:12 +05:00
thecodrr	10689d9ef9	feat: implement direct syncing using sse (experimental)	2020-08-24 13:07:16 +05:00
thecodrr	94e02adf67	fix: remove leading front slash from HOST	2020-08-24 11:27:21 +05:00
thecodrr	fcf2478d70	ci: fix merger test	2020-08-24 11:14:04 +05:00
thecodrr	37dbc7f4f4	feat: backend data structure changes	2020-08-22 11:25:23 +05:00
thecodrr	cc3e7cfb8e	merger: handle deleted delta merge conflict	2020-04-16 11:21:02 +05:00
thecodrr	8ad2bc5457	sync: prepare -> collector, other optimizations	2020-04-16 03:04:44 +05:00
thecodrr	8546742124	merger: keep most recent version if note is locked	2020-04-15 17:50:26 +05:00
thecodrr	c7634d7f4e	ci: fix all tests	2020-04-15 14:13:09 +05:00
thecodrr	2c9d7c285d	sync: sync vaultKey	2020-04-15 14:00:05 +05:00
thecodrr	cb7faa6d18	sync: TypeError: key cannot be null or undefined	2020-04-13 15:55:32 +05:00
thecodrr	ffa1e3b15c	sync: do not put iv & cipher as child of data	2020-04-13 13:04:12 +05:00
thecodrr	71ae5e0d5d	sync: send key as JSON	2020-04-13 12:56:35 +05:00
thecodrr	93f4fdfa6a	sync: encrypt/decrypt data before syncing	2020-04-13 12:04:49 +05:00
thecodrr	78f8a86181	merger: merge remote delta if none of the conditions meet	2020-04-11 12:07:40 +05:00
thecodrr	4e3517a747	merger: Cannot read property 'resolved' of undefined	2020-04-11 11:42:17 +05:00
thecodrr	4679d98e53	sync: resolve lastSynced timestamp issues	2020-04-11 11:17:58 +05:00
thecodrr	04b6345d7f	fix: tfun is not defined	2020-04-09 16:46:03 +05:00
thecodrr	359864f4a9	merger: merge delta if none of the specified conditions meet	2020-04-09 16:39:44 +05:00
thecodrr	02480da2e3	ci: add more tests and general fixes	2020-04-09 16:36:57 +05:00