12057 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ammar Ahmed	ff92ca495d	mobile: fix locked note title cannot be edited	2024-05-16 12:04:17 +05:00
Ammar Ahmed	5b57614bfe	mobile: fix app lock issues	2024-05-16 09:27:27 +05:00
Ammar Ahmed	ae7c538ad7	mobile: enable privacy screen with applock	2024-05-16 09:27:27 +05:00
Ammar Ahmed	c6394c9e37	mobile: allow removing app lock with account password	2024-05-16 09:27:27 +05:00
Ammar Ahmed	acf3740a68	mobile: fix pricing plans stuck at loading	2024-05-16 09:24:19 +05:00
Ammar Ahmed	8423543904	mobile: show diff in note history	2024-05-16 09:23:45 +05:00
Abdullah Atta	b90cb28637	web: handle corrupted+migrations: error	2024-05-16 08:40:03 +05:00
Abdullah Atta	780e1e9db0	web: reopen editor session if conflict is resolved/created	2024-05-15 12:37:50 +05:00
Abdullah Atta	ca6f8e5e4b	web: fix real time sync ignored when resolved content is synced	2024-05-15 12:37:08 +05:00
Abdullah Atta	4c4cda1c39	core: create conflict if local item is unsynced ... previously we were only creating a conflict when the local item was edited after the remote item. This failed in cases where even though the local item was edited before the remote item, it still contained important information. Now we only check if the local item is synced or not. If it isn't synced, we most probably want to preserve the local changes, or at least want to be notified.	2024-05-15 12:36:38 +05:00
Abdullah Atta	6fcbde772c	core: fix notes marked as conflicted wrongly	2024-05-15 12:34:23 +05:00
Abdullah Atta	eac1750b1c	core: add test for merge conflicts during sync	2024-05-14 15:21:00 +05:00
Abdullah Atta	5eea179a58	core: set conflicted property on notes after fetch is done	2024-05-14 15:21:00 +05:00
Abdullah Atta	fe1ea6dc27	core: do not update dateModified when updating content internally	2024-05-14 15:21:00 +05:00
Abdullah Atta	cf1b774255	core: filter out conflicted notes & content during sync	2024-05-14 15:21:00 +05:00
Abdullah Atta	198fa33fc0	core: do not update dateModified when setting synced=true	2024-05-14 15:21:00 +05:00
Abdullah Atta	e722866d62	web: better handling of database disk image is malformed error	2024-05-14 15:21:00 +05:00
Ammar Ahmed	58845e5508	mobile: release v3.0.4 3.0.4-android	2024-05-11 15:19:12 +05:00
Abdullah Atta	543c6f17ed	web: enable sourcemaps for web app	2024-05-11 13:09:59 +05:00
Abdullah Atta	533f95fcff	editor: fix editor crash due to TypeError: t.startsWith is not a function	2024-05-11 12:53:30 +05:00
Ammar Ahmed	c02f1cde16	mobile: disable template when pin note to notifications	2024-05-11 12:49:11 +05:00
Ammar Ahmed	043f55ead0	mobile: fix exporting note to text for share/copy	2024-05-11 12:49:11 +05:00
Ammar Ahmed	fcece06a1c	mobile: fix update notification not showing on mobile app	2024-05-11 12:49:11 +05:00
Abdullah Atta	da7d79edc6	core: token without a scope is invalid	2024-05-11 12:36:23 +05:00
Ammar Ahmed	a2e7190a4a	mobile: fix colors of error popup in editor	2024-05-11 11:26:15 +05:00
Ammar Ahmed	503f2b5876	mobile: fix cannot read property 'groupBy' of undefined	2024-05-11 11:22:59 +05:00
Abdullah Atta	68d57e2b27	web: bump version to 3.0.4 v3.0.4	2024-05-11 10:48:48 +05:00
Abdullah Atta	400aa574cd	core: fix 2fa codes not being sent	2024-05-11 10:29:02 +05:00
Abdullah Atta	5028bb1275	web: update snapshots v3.0.3 3.0.3-android	2024-05-10 15:30:35 +05:00
Abdullah Atta	27ae5bb5a2	desktop: use npx prebuildify instead of yarn	2024-05-10 15:24:39 +05:00
Abdullah Atta	83316fe299	web: update snapshots for linux	2024-05-10 15:20:57 +05:00
Ammar Ahmed	8869224de2	mobile: fix image preview not rendered on iOS	2024-05-10 15:04:28 +05:00
Ammar Ahmed	c4152f0fc0	mobile: set editor reset time to 10 minutes	2024-05-10 14:53:10 +05:00
Ammar Ahmed	d803005637	mobile: release v3.0.3	2024-05-10 14:47:27 +05:00
Ammar Ahmed	53d896be2b	mobile: fix opening exported files after export	2024-05-10 14:44:12 +05:00
Abdullah Atta	8c37c6409a	ci: use actions/upload-artifact@v4	2024-05-10 12:36:56 +05:00
Abdullah Atta	9195244890	web: fix tests	2024-05-10 12:31:55 +05:00
Ammar Ahmed	152794ccd0	mobile: fix image filename in picker	2024-05-10 12:24:40 +05:00
Ammar Ahmed	2e8b234b63	mobile: fix editor content update on realtime sync	2024-05-10 12:24:40 +05:00
Abdullah Atta	055c647698	web: add Audios tab in attachments dialog	2024-05-10 12:08:38 +05:00
Abdullah Atta	2b7bcfe7c6	web: bump version to 3.0.3	2024-05-10 12:00:06 +05:00
Abdullah Atta	3c8b8a7bc9	web: fix real time sync test	2024-05-10 11:58:56 +05:00
Abdullah Atta	fde45fb6de	web: saving timeout notice shown every time	2024-05-10 11:58:44 +05:00
Abdullah Atta	4a616a3e67	web: fix tab not updating when note is locked/unlocked	2024-05-10 11:27:26 +05:00
Abdullah Atta	bd0a338dd6	core: fix dateEdited not updating on saving locked content	2024-05-10 10:46:11 +05:00
Abdullah Atta	5ab721e3e2	core: fix async iterator on sql collection only returning dateCreated & id	2024-05-10 10:22:03 +05:00
Ammar Ahmed	cb70bb9429	mobile: fix errors	2024-05-10 09:22:23 +05:00
Abdullah Atta	82cadd473c	web: show error if saving takes more than 30 seconds	2024-05-10 09:22:23 +05:00
Ammar Ahmed	0e8ea3ddeb	mobile: fix editor loading	2024-05-10 09:22:23 +05:00
Ammar Ahmed	511acc5fca	mobile: handle editor not responding	2024-05-10 09:22:23 +05:00