188 Commits

Author	SHA1	Message	Date
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	4eb66538b7	sync: fix dateEdited being always set to Date.now for delta	2020-04-07 15:26:09 +05:00
thecodrr	95d18ed630	fix: update note before updating delta	2020-04-07 12:39:52 +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	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	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	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	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	5d8618f306	ci: improve restore test	2020-03-21 11:40:03 +05:00
thecodrr	99acc7fd38	fix: content is lost on restoring note	2020-03-21 11:15:24 +05:00
thecodrr	c1e6199cc7	sync: make it work (only upload working)	2020-03-19 15:14:29 +05:00
thecodrr	4fba9b1e2c	sync: fix inverted condition	2020-03-19 14:43:42 +05:00
thecodrr	8187c9b840	sync: fix merge returning objects instead of arrays	2020-03-19 14:39:08 +05:00
thecodrr	125104b379	fix: some error handling	2020-03-19 14:30:05 +05:00
thecodrr	7586aacc8e	fix: Can not use keyword 'await' outside an async function	2020-03-19 14:05:59 +05:00
thecodrr	4688d944fc	feat: add delta/text syncing	2020-03-19 14:03:29 +05:00
thecodrr	949ca56936	fix: notes searching	2020-03-19 12:38:33 +05:00
thecodrr	daf93e6f2c	feat: seperate text & delta	2020-03-19 11:30:05 +05:00
thecodrr	780ee93b58	sync: generate random id for items	2020-03-18 14:06:20 +05:00
thecodrr	e1366d1def	fix: classProperties not supproted error	2020-03-10 13:54:34 +05:00
thecodrr	766bc9ff51	refactor: export errors	2020-03-10 13:52:20 +05:00
thecodrr	968faab537	feat: add lookup class for searching	2020-03-09 12:39:49 +05:00
thecodrr	09ace6de29	ci: write tests for vault	2020-03-09 10:43:32 +05:00
thecodrr	cff0bef0b7	refactor: vault api	2020-03-08 11:33:55 +05:00
thecodrr	1146bdf5ae	feat: impl vault for encryption/decryption of notes	2020-03-07 12:29:55 +05:00
thecodrr	03f7505fbe	remove node-fetch	2020-02-23 19:57:46 +05:00
Waqar Ahmed	f8b5e6039e	Fix: Remove tags api from notes.js	2020-02-21 22:06:13 +05:00
Waqar Ahmed	979de6faf0	Feat: expose tags/colors in api	2020-02-21 21:39:27 +05:00
ammarahm-ed	04af9e1668	fix sync	2020-02-12 02:09:08 +05:00