Commit graph

4935 commits

Author SHA1 Message Date
ashilkn 38d843f246 minor change 2022-09-09 13:42:45 +05:30
ashilkn 78392da517 resolved merge conflicts 2022-09-09 12:56:59 +05:30
ashilkn b9f4ca1424 Merge branch 'master' of https://github.com/ente-io/frame into rewrite_device_sync_remote 2022-09-09 12:54:37 +05:30
Neeraj Gupta 5851e48fe1
minor refactor 2022-09-08 11:24:07 +05:30
Neeraj Gupta 83067bc523
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-08 10:50:27 +05:30
Neeraj Gupta 3c6acb85ba
Merge branch 'master' into rewrite_device_sync 2022-09-08 10:49:21 +05:30
Ashil 9c0226e549
Merge pull request #467 from ente-io/migrate-to-null-safety
started incremental migration to null safety
2022-09-07 18:12:31 +05:30
ashilkn c1722959e7 resolve merge conflicts 2022-09-07 17:56:24 +05:30
Neeraj Gupta a7fb6c6d43
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-07 17:31:09 +05:30
Neeraj Gupta c99fe1bf59
Merge branch 'master' into rewrite_device_sync_remote 2022-09-07 17:31:00 +05:30
Neeraj Gupta 28dda0443b
Merge branch 'master' into rewrite_device_sync 2022-09-07 17:30:39 +05:30
Vishnu Mohandas e9df56f979
Merge pull request #468 from ente-io/fix_storing_remote_collections 2022-09-07 17:02:54 +05:30
Neeraj Gupta 5b76113d83
bump version code to 0.6.31+361 2022-09-07 17:01:34 +05:30
Neeraj Gupta bb038e043b
Fix stupid bug: continue instead of break 2022-09-07 17:01:11 +05:30
Neeraj Gupta 463a886820
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-07 16:38:40 +05:30
ashilkn 7191d313ae minor fix 2022-09-07 16:38:32 +05:30
Neeraj Gupta 9b2a992a90
remove share collection icon from device folders 2022-09-07 16:28:38 +05:30
ashilkn 9529f852ea enabled null safety for files which are already null safe 2022-09-07 16:27:26 +05:30
Neeraj Gupta a5b516b643
Migrate existing backup folder selection 2022-09-07 16:20:02 +05:30
ashilkn 1c69673e07 remove language version comment from files which are already null safe 2022-09-07 16:05:50 +05:30
Neeraj Gupta cc0c6e3442
Import files from recent collection (isAll True) in the end 2022-09-07 16:01:18 +05:30
ashilkn eb7c1ec837 started incremental migration to null safety 2022-09-07 14:00:09 +05:30
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