32 Commits

Author	SHA1	Message	Date
thecodrr	3a5fd2ea65	fix: check and handle undefined data during sync merge	2021-06-03 09:18:18 +05:00
thecodrr	d28e29a09f	fix: undefined remote.data during conflict	2021-04-19 10:05:47 +05:00
thecodrr	ad970c2348	fix: do not cause conflict if remote === undefined	2021-03-06 09:39:47 +05:00
thecodrr	f6bdfa9a47	fix: do not migrate vaultKey	2021-03-06 09:36:50 +05:00
thecodrr	03e21221c7	feat: add notebook merging	2021-02-25 19:41:17 +05:00
thecodrr	91ec7d1a37	fix: do not cause conflict if remote === false	2021-02-25 09:31:11 +05:00
thecodrr	4652a74f43	fix: duplicate colors and tags on sync	2021-02-20 09:50:22 +05:00
thecodrr	60a7397ef5	fix: do not try to migrate locked notes	2021-02-18 09:30:48 +05:00
thecodrr	b5a0b9e649	feat: remove trash collection	2021-02-16 16:56:06 +05:00
thecodrr	dc95ad86e0	fix: remove all mention of delta	2021-02-12 10:15:37 +05:00
thecodrr	7cb084de54	feat: hash compare conflicted content items	2021-02-12 10:01:06 +05:00
thecodrr	690cd51862	fix: colors and tags syncing	2020-12-29 12:31:26 +05:00
thecodrr	f8c306380b	feat: migrate to use the new backend	2020-12-16 12:06:25 +05:00
thecodrr	ae4a1f9c61	fix: TypeError: Cannot read property '_settings' of undefined	2020-12-10 12:58:04 +05:00
thecodrr	654adf9e36	fix: improve sync migration	2020-12-06 14:50:01 +05:00
thecodrr	d220d05c1f	feat: add migration on sync	2020-12-06 11:13:17 +05:00
thecodrr	23daab7266	feat: add settings syncing	2020-12-05 11:26:02 +05:00
thecodrr	1d36ffde56	refactor: remove circular require	2020-11-25 00:48:02 +05:00
thecodrr	6b38d05a8f	feat: migrate from delta to content ... **This is a breaking change.** This will allow for extreme flexibility in the future. We have also removed `text` collection as it is unnecessary. Improvements in performance will be noticed while syncing. Known Issues: 1. Since notes lookup depends on note text, it will not work.	2020-11-04 10:17:37 +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	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	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