Commit graph

6641 commits

Author SHA1 Message Date
Neeraj Gupta 09e9bfac84
formatting changes 2023-01-06 14:03:46 +05:30
Neeraj Gupta 7ef4a34607
Add default value for actionSheetType 2023-01-06 14:00:35 +05:30
Neeraj Gupta 0cc7a91af5
Merge branch 'main' into uncategorized 2023-01-06 13:34:30 +05:30
Neeraj Gupta ac8eb5fdad
Merge pull request #776 from ente-io/bug_fixes
Trash/Restore: Bug fixes
2023-01-06 13:25:27 +05:30
Neeraj Gupta 160e90d322
Merge pull request #778 from ente-io/delete_states
Delete file(s): Switch to new actionSheet
2023-01-06 13:25:14 +05:30
Neeraj Gupta d8b6e76fad
Switch to new delete action sheet 2023-01-06 12:54:00 +05:30
Neeraj Gupta 0d1d3bc803
Fix: Add cancel option for file delete prompts 2023-01-06 12:35:33 +05:30
Neeraj Gupta a39a422b22
Switch to new action sheet while deleting single file 2023-01-06 12:21:47 +05:30
Neeraj Gupta d4126851f5
Merge pull request #777 from ente-io/actionSheetBodyHighlight
ActionSheet: Support for body highlight
2023-01-06 11:16:10 +05:30
Neeraj Gupta 106aa638e1
ActionSheet: Support for body highlight 2023-01-06 11:14:25 +05:30
Neeraj Gupta 54d14627b7
Fix: Local id value for trash diff 2023-01-06 10:49:46 +05:30
Neeraj Gupta b3bc236139
Fix mapping of files during restore 2023-01-06 10:47:00 +05:30
Neeraj Gupta 1d081795eb
Fix: Conditional check for null value 2023-01-06 10:22:19 +05:30
Neeraj Gupta 0d95b8bc17
Merge pull request #775 from ente-io/remove_redundant_code
iOS: Clean up the code fore password reminder
2023-01-05 20:04:37 +05:30
Neeraj Gupta 0d117a7752
iOS: Clean up the code fore password reminder 2023-01-05 20:00:41 +05:30
Neeraj Gupta 381b2ebfc9
RemoveV2: Move files to uncategorized collection 2023-01-05 16:47:34 +05:30
Neeraj Gupta 48622e0f9e
Lint: Add override suggestion 2023-01-05 16:45:24 +05:30
Neeraj Gupta 38ab84a710
Fix typo 2023-01-05 16:44:28 +05:30
Neeraj Gupta 005413f633
ButtonWidget: Reduce pop delay for inAlert button 2023-01-05 16:44:05 +05:30
Neeraj Gupta 4a6ed365bd
Merge pull request #774 from ente-io/edited-files-sync-bug-2
Edited files sync bug 2
2023-01-05 16:26:26 +05:30
ashilkn f08c447c61 Bug fix 2023-01-05 16:04:12 +05:30
ashilkn e9eb22c878 Stop notifiying local asset changes to avoid race condition 2023-01-05 15:43:55 +05:30
ashilkn b876ae0698 Removed tracking of edited files 2023-01-05 15:32:00 +05:30
Neeraj Gupta 3b8e98dba7
Merge pull request #773 from ente-io/fix_custom_time_bug
Minor bug fixes
2023-01-05 14:21:56 +05:30
Neeraj Gupta a2256ecfb3
Fix typo in toast util 2023-01-05 14:13:16 +05:30
Neeraj Gupta 99c724aa54
Fix lint issue 2023-01-05 14:12:55 +05:30
Neeraj Gupta ec40540486
Link expirary: Fix UI issue in custom time option 2023-01-05 14:12:34 +05:30
Ashil d0e626624d
Merge pull request #772 from ente-io/handle_edit_errors
Handle error during edit file
2023-01-05 13:03:03 +05:30
Neeraj Gupta 306a47bcaa
Merge pull request #771 from ente-io/fix_case
Fix case
2023-01-05 13:02:13 +05:30
Neeraj Gupta 0bc94e1eea
Handle error during edit file 2023-01-05 12:59:47 +05:30
Vishnu Mohandas 35674af47f
Fix case 2023-01-05 12:35:00 +05:30
Neeraj Gupta 0096a2a79f
Lint: clean up import 2023-01-05 09:59:36 +05:30
Neeraj Gupta 0ff8c3c52f
Minor fix 2023-01-05 09:59:17 +05:30
Neeraj Gupta 6fd0e9a5b2
Lint: Remove redundant cast 2023-01-05 09:58:45 +05:30
Neeraj Gupta 27cb3928f1
Merge pull request #763 from ente-io/unuploaded-duplicate-on-device-folder
Un-uploaded duplicate on device folder
2023-01-05 09:50:46 +05:30
ashilkn 8fd62127f8 Disabled asset change notifying only after getFile() is done on downloading a file 2023-01-05 09:48:17 +05:30
ashilkn 39bfd985bb Minor changes 2023-01-05 09:44:11 +05:30
Neeraj Gupta 97bf760c3b
minor refactor 2023-01-05 09:34:34 +05:30
ashilkn 578c822b01 minor change 2023-01-05 09:16:55 +05:30
ashilkn 0cbcfcfb93 Resolved merge conflicts 2023-01-05 09:15:30 +05:30
ashilkn caeb3ef84e Resolved merge conflicts 2023-01-05 09:13:43 +05:30
ashilkn 0b378c824e Trigger local sync after downloading a file 2023-01-05 09:09:15 +05:30
Neeraj Gupta c79d7e3bc2
Add support for getOrCreate Uncategorized collection 2023-01-05 09:08:27 +05:30
ashilkn 45f9cd1f34 Removed code related to tracking of downloadedFileIDs 2023-01-04 21:30:41 +05:30
ashilkn dfea70c019 Stop notifying local asset changes when downloading a file to avoid race condition 2023-01-04 21:27:31 +05:30
Neeraj Gupta 42677f6dc7
Merge pull request #770 from ente-io/cache-2fa-status-on-boarding
Cache 2FA status on on-boarding
2023-01-04 20:56:18 +05:30
ashilkn 89a54a5d8b Set 2FA status to true while on boarding if 2FA is enabled 2023-01-04 20:17:27 +05:30
Neeraj Gupta 9bd29bd010
Merge pull request #768 from ente-io/delete_album_progress 2023-01-04 13:30:28 +05:30
Neeraj Gupta 5f8ef8a3d9
Tweak UI for delete empty album progress 2023-01-04 13:14:02 +05:30
Neeraj Gupta 0b2df49d15
Merge pull request #767 from ente-io/ios_temp_clear
Clear Cache: Delete content from  iOS /tmp directory
2023-01-04 13:06:09 +05:30