56 Commits

Author	SHA1	Message	Date
ammarahm-ed	7cfdfcf458	fix merge conflict resolution	2021-12-31 11:05:42 +05:00
ammarahm-ed	a663023be2	uniform sizes	2021-12-16 10:20:34 +05:00
ammarahm-ed	6d2d1dd74a	update dialog ui similar to desktop app	2021-11-08 15:06:46 +05:00
ammarahm-ed	4b0d2a73a2	fix plain text viewer not loading on ios	2021-10-30 14:01:21 +05:00
ammarahm-ed	4721b180a1	fix attachment item ui in merge conflicts editor	2021-10-21 09:24:09 +05:00
ammarahm-ed	acd7cc93c1	fix image loading in merge editor	2021-10-18 15:01:22 +05:00
ammarahm-ed	608b10f0b0	refactor	2021-10-06 10:31:09 +05:00
ammarahm-ed	96731cd1c5	feat: handle attachments in merge conflict editor	2021-10-06 10:29:07 +05:00
ammarahm-ed	8a2447d8de	refactor	2021-10-02 10:26:29 +05:00
ammarahm-ed	7e29f214ed	update notes-core	2021-08-10 12:09:19 +05:00
ammarahm-ed	bf0e555821	fix recurring conflicts on saving local note	2021-08-10 11:00:06 +05:00
ammarahm-ed	00a8d3c702	resolve conflict without updating date edited of note	2021-07-25 12:04:01 +05:00
ammarahm-ed	25e0d8fb2c	fix share extension on ios	2021-07-08 09:34:21 +05:00
ammarahm-ed	4325b4ea81	allow on the fly note updating in editor	2021-07-03 12:47:19 +05:00
ammarahm-ed	e3d4176102	performance optimizations	2021-06-02 17:34:39 +05:00
ammarahm-ed	c5debd3e94	add relogin flow after user session expired.	2021-05-25 22:14:06 +05:00
ammarahm-ed	c089d800ce	run sync after merging note	2021-05-25 14:48:28 +05:00
ammarahm-ed	0f4de3e6bb	disable html diff	2021-05-25 14:44:43 +05:00
ammarahm-ed	f4e0169901	fix scroll disabled in merge editor	2021-05-20 11:05:03 +05:00
ammarahm-ed	746d7136ac	do not load tinymce in merge editor to improve performance.	2021-04-21 11:46:16 +05:00
ammarahm-ed	8289d97e00	fix: cannot go back with gesture in MergeEditor	2021-04-19 10:58:32 +05:00
ammarahm-ed	b7e3879396	fix sometimes content of note is not loaded.	2021-04-06 10:58:49 +05:00
ammarahm-ed	98f20aa7c6	show incoming and current note in merge editor	2021-02-27 13:36:46 +05:00
ammarahm-ed	05d8bca5fd	update all ToastEvent functions	2021-02-20 15:03:02 +05:00
ammarahm-ed	06f139901b	refactoring	2021-02-16 16:11:10 +05:00
ammarahm-ed	76f7000157	open links in InAppBrowser	2021-02-10 10:09:48 +05:00
ammarahm-ed	9e593bf43c	add diff support in merge editor	2021-02-09 13:49:19 +05:00
ammarahm-ed	11f25bfe61	fix merge editor	2021-02-09 12:01:19 +05:00
ammarahm-ed	85e2ff66aa	fix merge editor always saving same note	2021-01-30 10:56:53 +05:00
ammarahm-ed	74b2fdbf26	fix ui of merge editor in dark mode	2021-01-20 10:54:06 +05:00
ammarahm-ed	e14d5e10c4	fix merge editor ui	2021-01-13 16:32:35 +05:00
ammarahm-ed	b122bbfd04	clear console.log statements	2021-01-06 14:58:01 +05:00
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