Commit graph

4796 commits

Author SHA1 Message Date
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
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