Commit graph

6922 commits

Author SHA1 Message Date
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
Neeraj Gupta 7c45201380
Clear Cache: Delete content from iOS /tmp directory 2023-01-04 12:46:20 +05:30
Neeraj Gupta b3571993eb
Merge branch 'main' into uncategorized 2023-01-04 09:47:50 +05:30
Vishnu Mohandas 15566f4078
Merge pull request #766 from ente-io/dev_variant 2023-01-04 07:57:52 +05:30
Vishnu Mohandas 8e26025207
Merge pull request #765 from ente-io/ios_fix_toast_duration 2023-01-04 07:57:27 +05:30
Neeraj Gupta 54e12b643f
Merge branch 'main' into dev_variant 2023-01-04 05:40:05 +05:30
Neeraj Gupta 72e871c6aa
iOS: Fix short toast duration to 1s 2023-01-04 05:05:19 +05:30
Neeraj Gupta ee19fd8687
Merge pull request #764 from ente-io/fix_padding_social
Minor UI Fixes
2023-01-03 22:15:35 +05:30
Neeraj Gupta 09d3ebce1f
Fix spacing and make delete dialog dismissable 2023-01-03 22:03:47 +05:30
Neeraj Gupta f99581895a
Android: add dev variant 2023-01-03 22:01:04 +05:30
Neeraj Gupta 7afc0bca7a
bump version to 0.7.3+403 2023-01-03 21:26:21 +05:30
Neeraj Gupta d8230e9846
Fix padding 2023-01-03 20:46:32 +05:30
Neeraj Gupta 32bd8b96d6
Merge pull request #750 from ente-io/db_and_services
Complete Null Safety
2023-01-03 20:27:39 +05:30
Neeraj Gupta 628967e999
Merge branch 'db_and_services' of github.com:ente-io/photos-app into db_and_services 2023-01-03 20:25:12 +05:30
Neeraj Gupta 5f4b67b93e
Merge branch 'main' into db_and_services 2023-01-03 20:24:42 +05:30
ashilkn e4863dd14b Merge branch 'main' into unuploaded-duplicate-on-device-folder 2023-01-03 17:55:50 +05:30
Neeraj Gupta 75885a0571
Merge pull request #762 from ente-io/empty_albums
Support for deleting empty albums
2023-01-03 17:47:08 +05:30
ashilkn 8e24ce6e2f Removed tracking of downloaded files 2023-01-03 17:34:54 +05:30
ashilkn 3333dc7ab6 Removed adding of downloaded file to ignoredFiles 2023-01-03 16:58:54 +05:30
Vishnu Mohandas 34ec589f94
Merge pull request #746 from ente-io/keychain_migration 2023-01-03 16:12:30 +05:30