Commit graph

4863 commits

Author SHA1 Message Date
ashilkn f81c8791d4 Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-05 05:30:00 +05:30
ashilkn 7b3812044d Merge branch 'master' into dedupe-screen-changes 2022-09-05 05:28:23 +05:30
Manav 85b6d8db12
Merge pull request #458 from ente-io/strict_remote_to_local_match
Rewrite storeDiff logic to fix matching bugs
2022-09-04 18:51:25 +05:30
Neeraj Gupta a1b1afb3f5
Merge branch 'master' into rewrite_device_sync 2022-09-04 18:00:33 +05:30
Neeraj Gupta 23336ddd5d
Fix query for android 2022-09-04 17:45:08 +05:30
Neeraj Gupta 536d8b0440
Rewrite storeDiff logic to fix matching bugs 2022-09-04 17:12:22 +05:30
ashilkn 27ce0a7c76 button text not visible on dark mode fix 2022-09-03 20:14:49 +05:30
ashilkn 145b998294 sort clubbed dedepue files in alphabetical order of collection names 2022-09-03 20:01:46 +05:30
ashilkn 0308dcd665 show album name with dedupe files + UI changes 2022-09-03 19:15:23 +05:30
ashilkn 78ff0b5f30 UI changes for dedupe screen 2022-09-03 18:51:00 +05:30
ashilkn b83411f0bb deselect all option for dedupe screen 2022-09-03 13:20:45 +05:30
ashilkn c1da25fa7a removed commented code + bug fix 2022-09-03 08:32:42 +05:30
ashilkn 18abdb089d Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-03 07:16:37 +05:30
ashilkn c2272879f1 extracted local authentication to LocalAuthenticationService 2022-09-02 19:50:03 +05:30
Manav a3109c1dfa
Merge pull request #457 from ente-io/match_bug_fix
Fix: Set localID for all files with same uploadedFileID
2022-09-02 15:36:29 +05:30
Neeraj Gupta 1ad387979e
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-02 14:12:46 +05:30
Neeraj Gupta 298c94bb65
Merge branch 'match_bug_fix' into rewrite_device_sync 2022-09-02 14:12:14 +05:30
Neeraj Gupta 39affe4004
Fire event to remove stale entries 2022-09-02 13:53:49 +05:30
Neeraj Gupta 3baafc72fb
Fix: Set localID for all files with same uploadedFileID 2022-09-02 13:12:46 +05:30
Neeraj Gupta 81beff6f1d
Merge pull request #415 from ente-io/reupload_hash_check
[Part-0] Rewrite Sync: Use hash to avoid duplicate uploads
2022-09-02 12:07:45 +05:30
Ashil 8b28493803
Merge pull request #455 from ente-io/bugFix
Fix minor bugs in share warning for collections with hidden files
2022-09-02 10:57:28 +05:30
Manav 8aa745cbd6
Merge pull request #456 from ente-io/change_upload_icon
update cloud backup icon
2022-09-02 10:38:17 +05:30
Neeraj Gupta f6f812d5cc
update cloud backup icon 2022-09-02 10:34:10 +05:30
Neeraj Gupta 06cc2d083f
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-01 20:57:09 +05:30
Neeraj Gupta a018d33478
minor fixes 2022-09-01 20:56:51 +05:30
Neeraj Gupta b15c8528db
minor rename 2022-09-01 20:46:57 +05:30
Neeraj Gupta 567804f0f9
minor formatting and rename 2022-09-01 20:39:47 +05:30
Neeraj Gupta 7e6a54d318
ensure photo is not uploaded to Recent whenever possible 2022-09-01 18:11:32 +05:30
Neeraj Gupta 7a18d3ab38
make final 2022-09-01 15:11:50 +05:30
Neeraj Gupta 8dd3acac71
do not show warning if already shared 2022-09-01 15:10:45 +05:30
Neeraj Gupta 9b7c3ec7e0
Fix share collection action for device folder not backed up 2022-09-01 15:09:59 +05:30
Neeraj Gupta afc057953d
minor refactor and bug fixes 2022-09-01 14:49:35 +05:30
Neeraj Gupta eec540af93
review changes 2022-09-01 14:17:57 +05:30
Neeraj Gupta fd9603d3ae
remove redundant param 2022-09-01 13:40:52 +05:30
Neeraj Gupta 226c064d82
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-01 09:45:17 +05:30
Neeraj Gupta c0f47ec0e9
Merge branch 'master' into rewrite_device_sync_remote 2022-09-01 09:05:04 +05:30
Neeraj Gupta a5a135a611
minor rename refactoring 2022-09-01 01:34:02 +05:30
Neeraj Gupta 6afe51b6f3
remove unused synced col from device_files 2022-09-01 01:27:48 +05:30
Neeraj Gupta decbfe0145
Only show deviceFolder on UI if coverFile is found 2022-09-01 01:20:11 +05:30
Neeraj Gupta 718fcdf6cb
Rename device_collection.sync -> should_backup 2022-09-01 00:21:17 +05:30
Neeraj Gupta 40c76edbc5
remove unused method 2022-09-01 00:12:24 +05:30
Neeraj Gupta dc0c856a4c
rename DevicePathCollection to DeviceCollection 2022-09-01 00:09:39 +05:30
Neeraj Gupta e09e585c5f
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-31 23:58:48 +05:30
Neeraj Gupta 4ee0bebf73
Fix query in getFileCountInDeviceFolders 2022-08-31 23:50:00 +05:30
Neeraj Gupta 046dfc610a
FileUploader: return new or updated file after file linking to existing file 2022-08-31 23:46:04 +05:30
Neeraj Gupta cddcc786dc
Merge branch 'master' into reupload_hash_check 2022-08-31 23:16:12 +05:30
Ashil d686e4aba4
Merge pull request #449 from ente-io/hide-files
Hide files
2022-08-30 15:58:58 +05:30
ashilkn c255f02347 show alert if no local authentication on device when setting lockscreen 2022-08-30 14:34:23 +05:30
Ashil Kandapath d780752028 minor changes 2022-08-30 13:46:40 +05:30
Neeraj Gupta cfc55d7df3
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-08-30 13:11:35 +05:30