Commit graph

4763 commits

Author SHA1 Message Date
Neeraj Gupta 591e8ba1d9
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-07 13:50:43 +05:30
Neeraj Gupta 1d3ce385ec
Merge branch 'master' into rewrite_device_sync 2022-09-07 13:49:13 +05:30
Neeraj Gupta f7d90f2b08
refresh ui on device folder change 2022-09-07 13:45:48 +05:30
Neeraj Gupta 010982a0c0
store device collection upload strategy 2022-09-07 11:33:48 +05:30
Neeraj Gupta 29a0ebad8e
By default, only add to collection if file not already uploaded 2022-09-07 10:58:50 +05:30
Neeraj Gupta 1a020dc092
Merge pull request #466 from ente-io/show-all-collections-in-file-info
Show all collections in file info
2022-09-07 09:23:49 +05:30
ashilkn 12fb8b6a41 add 'Widget' at the end of widget class names 2022-09-07 09:12:30 +05:30
ashilkn 53199d5e91 used named parameters for FileInfoCollection 2022-09-07 07:33:54 +05:30
ashilkn dad8a9c234 minor changes 2022-09-07 07:26:51 +05:30
ashilkn 7966b2fe4c Merge branch 'master' into show-all-collections-in-file-info 2022-09-07 06:48:58 +05:30
ashilkn c385b32250 bug fix to show collection name in file info for incoming shared albums 2022-09-07 06:45:42 +05:30
ashilkn 961c5bab04 show device folder in file info for files on device 2022-09-07 06:22:03 +05:30
ashilkn 79687f282f refactored code 2022-09-07 06:00:39 +05:30
Neeraj Gupta e9e57a6f75
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-06 23:11:04 +05:30
Neeraj Gupta 9e78775167
Fire event on backup folder updation 2022-09-06 23:09:05 +05:30
Neeraj Gupta 8c3785c2d3
DeviceCollection: Remove unsued property 2022-09-06 22:21:05 +05:30
Neeraj Gupta 00cbc2e60c
Remove unsued device_folder and rename file 2022-09-06 22:19:02 +05:30
Neeraj Gupta f61ee05fbf
Merge branch 'master' into rewrite_device_sync 2022-09-06 22:14:25 +05:30
Vishnu Mohandas 49802befa0
Merge pull request #454 from ente-io/handle-cases-for-no-password-on-device 2022-09-06 17:50:39 +05:30
Vishnu Mohandas 86b6c3c6fd
Merge pull request #465 from ente-io/alreadyClaimedAccount 2022-09-06 17:40:37 +05:30
ashilkn 18dfbcdb61 refactored code 2022-09-06 17:38:43 +05:30
Neeraj Gupta b9f14ed260
copy change 2022-09-06 17:21:34 +05:30
Neeraj Gupta 1612b4f8f6
Show error if user tries to link existing subscription to another account 2022-09-06 17:02:22 +05:30
ashilkn a85f2229a7 show all collection of file in file info + remaned RawExifButton file 2022-09-06 16:57:39 +05:30
ashilkn 9637a5df49 Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-06 14:08:14 +05:30
ashilkn 4bf751ea28 refactoring + variable name changes 2022-09-06 14:05:34 +05:30
Vishnu Mohandas f51016c995
Merge pull request #464 from ente-io/bug_fix_fk 2022-09-05 23:11:31 +05:30
Neeraj Gupta d9217dee41
Fix typo 2022-09-05 23:00:53 +05:30
ashilkn 0d01c06f6a minor changes 2022-09-05 19:24:53 +05:30
ashilkn dd1bba1094 minor fix 2022-09-05 17:59:24 +05:30
ashilkn 1b06395e9c create service file for local authentication 2022-09-05 16:02:04 +05:30
Manav db347ffe85
Merge pull request #463 from ente-io/bump_version_tf
bump version code to 0.6.30+360
2022-09-05 16:01:26 +05:30
Neeraj Gupta 69e4e5a74e
bump version code to 0.6.30+360 2022-09-05 16:00:26 +05:30
ashilkn bf1743cb8f minor bug fix 2022-09-05 15:40:59 +05:30
ashilkn 80557f0adf Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-05 15:25:34 +05:30
Ashil 83ec09240e
Merge pull request #460 from ente-io/loading-photos-background-alignment-fix
Loading photos background alignment fix
2022-09-05 15:24:46 +05:30
Neeraj Gupta 53d1ee491a
Merge pull request #462 from ente-io/fix_sync_ui_status
Fix missing feedback for remote sync
2022-09-05 15:23:09 +05:30
ashilkn 242498b6a6 removed SmallGradientButton 2022-09-05 15:21:39 +05:30
ashilkn 7564322d06 Merge branch 'master' into loading-photos-background-alignment-fix 2022-09-05 15:10:42 +05:30
Ashil 9f71a4c2e7
Merge pull request #459 from ente-io/dedupe-screen-changes
Dedupe screen changes
2022-09-05 15:02:30 +05:30
Neeraj Gupta cf92871a64
minor fix 2022-09-05 14:33:49 +05:30
Neeraj Gupta 491fb0b19a
Fix missing feedback for remote sync 2022-09-05 14:14:21 +05:30
Neeraj Gupta edbc323352
Merge pull request #461 from ente-io/fix_resync_logic
Fix: Improve logic to reset the syncTime for collections
2022-09-05 13:52:13 +05:30
Neeraj Gupta b96c2814af
rename 2022-09-05 13:43:47 +05:30
Neeraj Gupta 4a011b3d56
Improve logic for resetting syncTime 2022-09-05 13:38:10 +05:30
ashilkn 44495c721c center aligned assets + other UI changes 2022-09-05 10:45:14 +05:30
ashilkn bd62f21bd5 lock screen UI layout fix + made SmallGradientButton component 2022-09-05 10:03:29 +05:30
ashilkn 4f6a6c55f1 replaced loading_photos_background asset with new one 2022-09-05 09:09:29 +05:30
ashilkn ddb71e559e minor UI change 2022-09-05 06:35:04 +05:30
ashilkn f6809cf9be misc. changes 2022-09-05 06:20:06 +05:30