Commit graph

2291 commits

Author SHA1 Message Date
abhinav-grd e3021dcf55 remove archived local state 2021-09-22 15:57:56 +05:30
abhinav-grd 609a7bb989 create new updatedFiles array instead of upadating the existing selectedFiles 2021-09-22 15:41:39 +05:30
abhinav-grd 46471d4c25 Revert "added queue processor to file decryption"
This reverts commit 3cab5372e9.
2021-09-22 14:52:50 +05:30
abhinav-grd 9a24f617ca updated filtering logic 2021-09-22 14:28:16 +05:30
abhinav-grd c30285e2b8 Merge branch 'master' into archive 2021-09-22 14:07:42 +05:30
Abhinav-grd acbb69321b
Merge pull request #154 from ente-io/disable-shared-collection-ops
Disable shared collection ops
2021-09-22 14:07:16 +05:30
abhinav-grd 2d8cb444df unarchive files 2021-09-22 13:58:23 +05:30
abhinav-grd 31632d779f set archived to quickly show archived file before server sync 2021-09-22 13:51:06 +05:30
abhinav-grd cbb880b42d fixed arhive file not visible bug 2021-09-22 13:29:08 +05:30
abhinav-grd 6cf696a164 Merge branch 'disable-shared-collection-ops' into archive 2021-09-22 13:25:16 +05:30
abhinav-grd c4165dca8c add conditional lookup 2021-09-22 13:08:45 +05:30
abhinav-grd 42c1687b3f fix archive icon import 2021-09-22 12:45:34 +05:30
abhinav-grd b45b6af9e1 renamed archive collection to archive section 2021-09-22 12:45:27 +05:30
abhinav-grd e067b7260b add a collection chip for archive section 2021-09-22 12:45:09 +05:30
abhinav-grd ea6074462f fixes collection related warning 2021-09-22 12:44:56 +05:30
abhinav-grd b928a66c65 Merge branch 'master' into disable-shared-collection-ops 2021-09-22 12:34:21 +05:30
abhinav-grd c98d4792be Merge branch 'move-files' into disable-shared-collection-ops 2021-09-22 12:34:12 +05:30
Abhinav-grd 896a450762
Merge pull request #152 from ente-io/move-files
Move files
2021-09-22 12:25:16 +05:30
abhinav-grd f1848eca54 Merge branch 'master' into archive 2021-09-22 12:23:42 +05:30
abhinav-grd 6eb47c1fb9 Merge branch 'master' into move-files 2021-09-22 12:02:58 +05:30
Abhinav-grd 7edda03145
Merge pull request #156 from ente-io/fix-active-collection-undefined-for-all
set active collection to 0 for all section
2021-09-22 11:11:04 +05:30
abhinav-grd 6524204b2d set active collection to 0 for all section 2021-09-22 10:37:08 +05:30
abhinav-grd 1a8c4dcf23 makes move icon thinner 2021-09-22 10:23:26 +05:30
abhinav-grd 0bb82c189e better variable names 2021-09-21 17:52:31 +05:30
abhinav-grd d039dd87ef fixes magic metadata verison 2021-09-21 17:26:34 +05:30
abhinav-grd 973aedb7d3 fix magicMetadata encryption and decryption 2021-09-21 17:14:28 +05:30
abhinav-grd 3cab5372e9 added queue processor to file decryption 2021-09-21 17:13:18 +05:30
abhinav-grd 4250ad7c34 add option to view archived file on the sidebar 2021-09-21 16:59:24 +05:30
abhinav-grd a26722d8de refactor deleteFileHelper and delete API 2021-09-21 16:09:04 +05:30
abhinav-grd ea6a2165e2 added Archive logic 2021-09-21 16:08:03 +05:30
abhinav-grd 3021fd4a43 update updateMagicMetadata API 2021-09-21 16:07:53 +05:30
abhinav-grd 0b62609591 added updateMagicMetadata 2021-09-21 13:33:15 +05:30
abhinav-grd 78533c01e9 adds magicMetadata decryption logic 2021-09-21 13:15:17 +05:30
abhinav-grd 760cdef036 update decryptMetadata to handle any generic json decryption 2021-09-21 13:14:29 +05:30
abhinav-grd 57aa358865 hides archived from all section 2021-09-21 13:00:39 +05:30
abhinav-grd fe33c63c2f adds archive and unarchive icons 2021-09-21 12:25:52 +05:30
Abhinav-grd 0781e76c67
Merge pull request #153 from ente-io/update-selection-behaviour
Update selection behaviour
2021-09-21 12:13:08 +05:30
abhinav-grd a278b1d901 hide shared collection files from all section 2021-09-21 12:08:50 +05:30
abhinav-grd 5ec72c2550 added ownerID to check if file is a shared file 2021-09-21 12:07:39 +05:30
abhinav-grd ae881e6a4f fix isSharedCollection 2021-09-21 11:56:26 +05:30
abhinav-grd 801ff1a856 Merge branch 'move-files' into disable-shared-collection-ops 2021-09-21 11:48:08 +05:30
abhinav-grd d8230155fc remove unneccesary showCollectionSelector prop 2021-09-21 11:37:03 +05:30
abhinav-grd 065c051230 no need of adding isShared property to collection and can compare whenever needed 2021-09-21 11:31:47 +05:30
abhinav-grd 6c597570d1 better remove fromCollection 2021-09-20 21:08:14 +05:30
abhinav-grd cfb3f048e4 rename variable 2021-09-20 20:50:09 +05:30
abhinav-grd bc9a785093 disable fav button for sharedCollection 2021-09-20 19:20:45 +05:30
abhinav-grd ec0bc9919a disable selecting for sharedColletion 2021-09-20 19:20:17 +05:30
abhinav-grd 5fcde0b6e6 added isShared property to collection and isSharedCollectionActive state 2021-09-20 19:16:08 +05:30
abhinav-grd 1e45557e34 avoid double filtering 2021-09-20 18:58:46 +05:30
abhinav-grd 641053a025 hide collection from which file are moved from collection selector view 2021-09-20 18:54:26 +05:30