353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	a4d48b8da2	user: fix expiry time handling	2020-04-11 11:28: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
thecodrr	43904aaee8	ci: add utils test	2020-04-07 19:05:10 +05:00
thecodrr	4357a1e496	ci: add user model tests	2020-04-07 19:05:00 +05:00
thecodrr	372e4e2447	ci: make tests pass	2020-04-07 15:50:39 +05:00
thecodrr	4eb66538b7	sync: fix dateEdited being always set to Date.now for delta	2020-04-07 15:26:09 +05:00
thecodrr	c3cee28e7f	fix: conflicted key being overwritten	2020-04-07 12:50:58 +05:00
thecodrr	95d18ed630	fix: update note before updating delta	2020-04-07 12:39:52 +05:00
thecodrr	e7ce8dbf2b	fix: resolved notes get conflicted again on sync	2020-04-04 14:59:51 +05:00
thecodrr	db0e723c1b	fix: do not merge resolved notes	2020-04-04 13:52:40 +05:00
thecodrr	6dfaf3abf5	fix: conflicts recalculation conditional	2020-04-04 13:36:32 +05:00
thecodrr	525f933a51	fix: Conflicts is not defined	2020-04-04 13:34:17 +05:00
thecodrr	90306e5410	fix: support for class properties is not enabled	2020-04-04 13:31:47 +05:00
thecodrr	4dc3d2fe44	feat: recalculate conflicts on sync	2020-04-04 13:29:33 +05:00
thecodrr	10ee35a145	feat: send error code with merge conflict error	2020-03-29 21:30:33 +05:00
thecodrr	c7af1c905e	sync: do not use dateEditted for time comparison	2020-03-29 19:42:26 +05:00
thecodrr	5e6808bf5d	fix: conflicted delta not being added to local delta	2020-03-29 19:21:55 +05:00
thecodrr	defa827e4d	feat: add merge conflict handling	2020-03-29 19:20:12 +05:00
thecodrr	d76709fe1e	perf: use single loop for notes filtering	2020-03-26 10:24:43 +05:00
thecodrr	6ee472708c	fix: content.delta saved as object instead of hex id	2020-03-25 12:18:04 +05:00
thecodrr	9716f77a86	fix: tags not merged correctly on sync	2020-03-25 11:54:46 +05:00
thecodrr	a64c600e62	sync: merge remote trash items directly	2020-03-24 13:02:16 +05:00
thecodrr	164d511b55	fix: do not always send deleted items	2020-03-24 12:45:19 +05:00
thecodrr	57cfae37c1	fix: sync condition	2020-03-24 12:23:30 +05:00
thecodrr	0901901e21	fix: invert condition	2020-03-24 12:23:05 +05:00
thecodrr	d991efb5f6	refactor: remove unnecessary condition	2020-03-24 12:21:00 +05:00
thecodrr	cfd01a0128	fix: only update lastSynced time if we have synced	2020-03-24 12:20:15 +05:00
thecodrr	c5af1ab9ae	sync: send dateEdited and dateCreated with deleted items	2020-03-24 12:00:54 +05:00
thecodrr	6d82034ad7	sync: send deleted state with item	2020-03-24 11:45:39 +05:00
thecodrr	5cce798257	fix: do not create new trash item on sync	2020-03-23 15:40:22 +05:00
thecodrr	84c045445b	fix: add id with deleted item	2020-03-23 15:32:06 +05:00
thecodrr	4113a8887a	fix: undefined .	2020-03-23 15:25:19 +05:00
thecodrr	9439ba7739	fix: send raw collections	2020-03-23 15:06:12 +05:00
thecodrr	025a953cea	feat: handle deletion for sync	2020-03-23 13:22:28 +05:00
thecodrr	5e388657f2	fix: Cannot read property 'dateDeleted' of undefined	2020-03-22 15:08:11 +05:00
thecodrr	8a4712a6f4	sync: add trash syncing support	2020-03-22 15:04:11 +05:00
thecodrr	7372c4436d	fix: tags & colors not being synced	2020-03-22 14:28:55 +05:00
thecodrr	38d5012c88	fix: this.db.colors.raw is not a function	2020-03-22 13:18:04 +05:00
thecodrr	e38441c239	fix: this.db > this._db	2020-03-22 13:03:26 +05:00
thecodrr	6e73268145	fix: user is not defined	2020-03-22 12:58:38 +05:00
thecodrr	c958f9e612	sync: add tag & colors syncing	2020-03-22 12:48:01 +05:00
thecodrr	8713d5d55f	refactor: prettify	2020-03-22 11:31:25 +05:00
thecodrr	57e6db274e	fix: clone tag before editing	2020-03-22 11:27:29 +05:00
thecodrr	0d2cb3e245	feat: add noteIds arrays to tags & colors collection	2020-03-22 10:59:06 +05:00
thecodrr	4928de3fac	fix: collection map not being updated	2020-03-21 12:33:39 +05:00