Commit graph

4838 commits

Author SHA1 Message Date
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
Neeraj Gupta 19832b82b5
Merge branch 'master' into rewrite_device_sync_remote 2022-08-30 13:03:54 +05:30
Ashil Kandapath 5850074120 minor changes 2022-08-30 12:13:51 +05:30
Ashil Kandapath d81c43268b resolved merge conflicts 2022-08-30 11:44:57 +05:30
Neeraj Gupta 708512093e
make method private 2022-08-30 11:36:33 +05:30
Neeraj Gupta 9778c2f42b
undo redundant changes 2022-08-30 10:58:15 +05:30
Neeraj Gupta 22a1f5dde6
Simplify removal of ignoredFiles + documentation 2022-08-30 10:48:34 +05:30
Ashil Kandapath 26ae27baa5 make strings const 2022-08-30 10:44:18 +05:30
Ashil Kandapath e8e89b1bf2 resolved merge conflicts 2022-08-30 10:33:56 +05:30
ashilkn 67597bf627 handled bugs related to when there is no device level authentication 2022-08-30 10:17:17 +05:30
Neeraj Gupta 923795bb58
mark private 2022-08-29 23:49:10 +05:30
Neeraj Gupta 97ed88de3d
remove unused method 2022-08-29 23:35:49 +05:30
Neeraj Gupta 2bbacb26ee
mark variables as final when possible 2022-08-29 23:35:13 +05:30
Neeraj Gupta 1533ac4098
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-29 23:32:00 +05:30
Neeraj Gupta 792dd67ade
Merge branch 'master' into reupload_hash_check 2022-08-29 23:20:21 +05:30
Neeraj Gupta 531b4a0490
add review comments 2022-08-29 23:13:17 +05:30
Manav 38525ba9b5
Merge pull request #453 from ente-io/final
final all the vars!
2022-08-29 20:17:45 +05:30
vishnukvmd 83c4ec877f Unapply automated fix 2022-08-29 20:16:44 +05:30
Ashil Kandapath a278df2f23 exclude collectionID = -1 rows while querying for c-ids of hidden files 2022-08-29 20:14:07 +05:30
vishnukvmd 06ec7cb658 final all the vars! 2022-08-29 20:13:31 +05:30
Neeraj Gupta c62de21916
Fix: Compute hash for files shared to ente 2022-08-29 17:27:43 +05:30
Neeraj Gupta ba221e7d73
Merge branch 'master' into reupload_hash_check 2022-08-29 16:50:05 +05:30
Vishnu Mohandas 3b8d8bb4fb
Merge pull request #451 from ente-io/add_exception
Include exception detail in the log
2022-08-29 16:25:04 +05:30
Neeraj Gupta 6d48964a7b
bump version code to 0.6.29+359 2022-08-29 16:23:26 +05:30
Neeraj Gupta ba82402969
log actual exception 2022-08-29 16:23:09 +05:30
Vishnu Mohandas 84724bb87c
Merge pull request #450 from ente-io/incorrect_password_logs
Support for sending logs during sign up
2022-08-29 16:04:00 +05:30