alihamuh
|
086d5544b9
|
docs: addd assets for merge conflict help file
|
2024-08-23 18:09:59 +05:00 |
|
alihamuh
|
5e000953c7
|
docs: added merge-conflicts file
|
2024-08-23 16:39:52 +05:00 |
|
Abdullah Atta
|
dfc5d7ae49
|
docs(help): update merge conflicts
|
2024-08-23 12:13:18 +05:00 |
|
Muhammad Ali
|
f5163f32d8
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-22 14:37:14 +05:00 |
|
Muhammad Ali
|
93628129a4
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-22 14:12:17 +05:00 |
|
Muhammad Ali
|
297914b1ee
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-21 18:05:26 +05:00 |
|
Muhammad Ali
|
50d6bdd316
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-21 18:03:58 +05:00 |
|
Muhammad Ali
|
9df1484ef0
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-21 13:23:21 +05:00 |
|
Muhammad Ali
|
6a2039789f
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-21 04:33:31 +05:00 |
|
Muhammad Ali
|
ca72f5b7cf
|
Update merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-21 04:26:46 +05:00 |
|
Muhammad Ali
|
e0643d08c5
|
Update merge-conflicts.md
edited merge conflict file
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-20 15:02:24 +05:00 |
|
Muhammad Ali
|
07cfd74506
|
Delete docs/help/contents/merge-conflict.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-20 14:56:56 +05:00 |
|
Muhammad Ali
|
1d40054ac0
|
Create merge-conflict.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-20 14:56:09 +05:00 |
|
Muhammad Ali
|
5cd37f4b64
|
Create merge-conflicts.md
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
|
2024-08-20 14:53:51 +05:00 |
|
Tai Lam
|
25675f71e8
|
help: Capitalize all instances of "URL" (#6402)
Capitalize all instances of "URL"
Signed-off-by: Tai Lam <47955724+taivlam@users.noreply.github.com>
|
2024-08-20 12:55:27 +05:00 |
|
Ammar Ahmed
|
202534fca9
|
mobile: correctly handle error on backup failed
|
2024-08-19 10:51:14 +05:00 |
|
Ammar Ahmed
|
a57558d8ab
|
mobile: fix restoring backups
|
2024-08-19 10:50:44 +05:00 |
|
Ammar Ahmed
|
f1c201dca9
|
core: fix reset attachment failed status
|
2024-08-19 10:50:44 +05:00 |
|
Ammar Ahmed
|
a73bff83fa
|
mobile: bump version
|
2024-08-17 17:59:44 +05:00 |
|
Abdullah Atta
|
e4428299bc
|
web: fix trial expired reminder dialog shown again and again
|
2024-08-16 18:10:35 +05:00 |
|
Abdullah Atta
|
487567ffbc
|
web: upgrade paddle checkout code
|
2024-08-16 18:06:07 +05:00 |
|
Abdullah Atta
|
efd83e6de3
|
web: add debug logging to checkout
|
2024-08-16 11:22:13 +05:00 |
|
Ammar Ahmed
|
a07230f707
|
mobile: remove old patches
|
2024-08-16 10:52:16 +05:00 |
|
Abdullah Atta
|
35a2e11afd
|
web: improve toast shown to basic users on using pro features
|
2024-08-16 10:28:39 +05:00 |
|
Abdullah Atta
|
cf4a7a3d34
|
core: limit notebooks to 20 on basic plan
|
2024-08-16 10:28:39 +05:00 |
|
Abdullah Atta
|
86e661ccd6
|
core: do not allow creating colors in basic plan
|
2024-08-16 10:28:39 +05:00 |
|
Abdullah Atta
|
e7be9b35ed
|
core: limit tags to 5 on basic plan
|
2024-08-16 10:28:39 +05:00 |
|
Muhammad Ali
|
53a367b0b2
|
clipper(web): fix web clipper not capturing images (#6348)
* clipper: added config settings for images
* clipper(web): enable image clipping
* clipper(web): fix clipper not respecting cors proxy setting
---------
Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>
|
2024-08-16 10:28:14 +05:00 |
|
Ammar Ahmed
|
b6206e2ca7
|
mobile: take backup before logout
|
2024-08-14 12:53:57 +05:00 |
|
Abdullah Atta
|
a910c819f2
|
web: fix error text ui
|
2024-08-14 12:53:57 +05:00 |
|
Abdullah Atta
|
6dd7a4960f
|
web: show warning if there are unsynced changes on logout
|
2024-08-14 12:53:57 +05:00 |
|
Abdullah Atta
|
c4e15b8f90
|
web: ask to create backup before logout in all cases
|
2024-08-14 12:53:57 +05:00 |
|
Abdullah Atta
|
f458a4b86a
|
web: check unsynced changes and ask for backup before logout
|
2024-08-14 12:53:57 +05:00 |
|
Abdullah Atta
|
8a44a7b99a
|
core: add api for checking unsynced changes
|
2024-08-14 12:53:57 +05:00 |
|
Ammar Ahmed
|
25065c01a0
|
mobile: Fix apk size increase in v3.0.13
|
2024-08-14 12:19:42 +05:00 |
|
Abdullah Atta
|
87ae9e86e7
|
editor: remove 500ms debounce from image observer
|
2024-08-14 09:18:26 +05:00 |
|
Abdullah Atta
|
782c53b622
|
web: impl chunkSize method for faster file size calculation
|
2024-08-14 09:18:26 +05:00 |
|
Abdullah Atta
|
cb52b390ab
|
fs: add chunkSize method for faster file size calculation
|
2024-08-14 09:18:26 +05:00 |
|
Abdullah Atta
|
5a49941003
|
core: cache attachment key for faster attachment reading
|
2024-08-14 09:18:26 +05:00 |
|
Ammar Ahmed
|
6797b9b621
|
mobile: prompt before restoring a backup
|
2024-08-13 15:47:10 +05:00 |
|
Ammar Ahmed
|
031a1b31b4
|
mobile: fix backup success toast
|
2024-08-13 15:40:10 +05:00 |
|
Ammar Ahmed
|
4e5762be45
|
mobile: check server compatible
|
2024-08-13 11:19:47 +05:00 |
|
Abdullah Atta
|
7a6ba5d1d1
|
web: check server version compatibility when testing connection
|
2024-08-13 11:19:47 +05:00 |
|
Abdullah Atta
|
cc3ccd041d
|
core: add function for checking compability with server
|
2024-08-13 11:19:47 +05:00 |
|
Ammar Ahmed
|
31453dc098
|
mobile: server configuration settings
|
2024-08-13 11:19:47 +05:00 |
|
Abdullah Atta
|
2e84099c80
|
web: fix typo
|
2024-08-13 11:19:47 +05:00 |
|
Abdullah Atta
|
5bbc0cd452
|
web: add support for changing server urls
|
2024-08-13 11:19:47 +05:00 |
|
Abdullah Atta
|
22aae401ba
|
web: improve checks before download & upload of attachment
|
2024-08-13 11:09:03 +05:00 |
|
Ammar Ahmed
|
97f135cd07
|
mobile: fix attachment downloading
|
2024-08-13 11:09:03 +05:00 |
|
Abdullah Atta
|
976f933233
|
web: check for s3 errors on downloading attachment
|
2024-08-13 11:09:03 +05:00 |
|