24 Commits

Author	SHA1	Message	Date
ammarahm-ed	69bab5dab4	fix ui issues in merge editor	2021-01-05 10:20:16 +05:00
ammarahm-ed	e0d8fae364	Keep Screen Awake in merge editor	2021-01-03 12:40:59 +05:00
ammarahm-ed	ce07ccb5cd	refactor	2021-01-01 18:55:26 +05:00
ammarahm-ed	3f2ae0bf0a	show correct date on editor	2020-12-27 14:11:32 +05:00
ammarahm-ed	283f981acd	fix dialog	2020-12-27 13:51:09 +05:00
ammarahm-ed	d32f1972fe	fix note conflict editor	2020-12-08 14:39:03 +05:00
ammarahm-ed	6206b3403f	layout basic e2e testing	2020-11-30 16:16:03 +05:00
ammarahm-ed	c0cbf32a57	fix merge dialog applyChanges not working	2020-11-29 13:23:46 +05:00
ammarahm-ed	9cfcea0b4e	fix merge editor	2020-11-29 12:35:55 +05:00
ammarahm-ed	ceeb7a1468	fix merge editor ui	2020-11-29 12:21:36 +05:00
ammarahm-ed	2ae6e48627	do not load dialogs on init in memory	2020-11-23 12:32:33 +05:00
ammarahm-ed	c5c2ed0bf5	refactor: typography	2020-11-20 01:23:05 +05:00
ammarahm-ed	4e9d71a969	cleanup and refactor	2020-10-13 17:02:14 +05:00
ammarahm-ed	5ac90dc100	fix all buttons	2020-09-09 11:10:35 +05:00
ammarahm-ed	21a533b612	fix useEffects recurring	2020-05-08 23:43:38 +05:00
ammarahm-ed	41df9483e7	fix empty note creation	2020-04-11 12:16:05 +05:00
ammarahm-ed	75e3540a8b	fix background of merge-editor	2020-04-11 11:11:42 +05:00
ammarahm-ed	dec9a9c192	fix delta resolving	2020-04-07 10:22:17 +05:00
ammarahm-ed	52c2cf13df	update	2020-04-06 13:14:27 +05:00
ammarahm-ed	937dd5be37	update quill	2020-04-06 11:37:20 +05:00
ammarahm-ed	c97f669e01	handle conflicted note	2020-03-31 10:55:19 +05:00
ammarahm-ed	3c34a75cfb	fix merge	2020-03-26 15:50:10 +05:00
ammarahm-ed	4d7af5c3ac	add merging	2020-03-26 15:42:37 +05:00
ammarahm-ed	df9f4e8d66	add note merging ui flow	2020-03-26 13:39:04 +05:00