Commit graph

504 commits

Author SHA1 Message Date
Neeraj Gupta 3361db1029
Fix minor bug 2022-12-20 15:08:21 +05:30
Neeraj Gupta 8bac31cbb7
Add uncategorized type & fix parsing from string to type 2022-12-20 15:02:57 +05:30
Neeraj Gupta 670fea0abe
Fix create collectionr request 2022-12-20 15:02:12 +05:30
Neeraj Gupta aed55f5770
Merge pull request #695 from ente-io/collaboration_view
Prettify Sharing + Collect Files 
2022-12-19 15:34:56 +05:30
Neeraj Gupta 05ca972d23
Fix bug in file selection check 2022-12-17 16:07:46 +05:30
Neeraj Gupta 87d76acc1f
Fix: open collection with correct appBarType 2022-12-17 14:58:16 +05:30
Neeraj Gupta 66c5e0f24f
Use new bottom bar for gallery folder page 2022-12-16 15:29:48 +05:30
vishnukvmd ff635f1a95 Merge remote-tracking branch 'origin/collaboration_view' into collect_changes 2022-12-16 14:02:55 +05:30
Neeraj Gupta 5f5cdabf37
Show delete option for hidden bottom menu 2022-12-16 13:13:41 +05:30
Neeraj Gupta 9f655a2c5b
Show hide option on archive bottom menu 2022-12-16 13:01:07 +05:30
vishnukvmd e0f6db707c Show uploader avatar for collected files 2022-12-16 12:10:55 +05:30
Neeraj Gupta ff4611b192
hook more options on file selections 2022-12-15 16:54:51 +05:30
Neeraj Gupta 439c7241d4
Add hooks for more file actions 2022-12-15 15:32:46 +05:30
Neeraj Gupta aa14d41388
Add new galleryType: favortie 2022-12-15 14:58:08 +05:30
Neeraj Gupta 26a403b642
Add helper method to show file ownership split 2022-12-15 08:45:10 +05:30
Neeraj Gupta 8ec8944fbd
FileSelection: Show various actions based on gallery type 2022-12-14 23:05:08 +05:30
Neeraj Gupta df1e0c3d10
GalleryType: add action method for addToAlbum option 2022-12-14 22:17:33 +05:30
ashilkn aca1da4b43 Removed Equatable in UserDetails 2022-12-13 20:23:58 +05:30
Neeraj Gupta 8891b0ce58
Merge branch 'master' into collaboration_view 2022-12-11 19:18:23 +05:30
Neeraj Gupta d2c760ae5d
Model changes for collect 2022-12-11 18:36:36 +05:30
Neeraj Gupta cb455fff11
Fix lint warning 2022-12-08 11:37:57 +05:30
Neeraj Gupta 373d0812fc
simplify logic to compute useFileTimeStamp flag 2022-12-08 11:09:58 +05:30
Neeraj Gupta 85c6f87168
Fix typo 2022-12-08 10:58:10 +05:30
Neeraj Gupta ed76ca0b39
Prefer existing creationTime if tileFromFileName is close to existing time 2022-12-08 10:55:32 +05:30
Neeraj Gupta 0f72c1b4a2
Android: Parse timestamp from fileName during upload 2022-12-08 09:58:33 +05:30
Neeraj Gupta a075f335e8
Fix state fresh issues while adding/remove participants 2022-11-25 16:34:35 +05:30
Neeraj Gupta 54eef4f112
Add enum for collection participant 2022-11-22 21:23:50 +05:30
Neeraj Gupta 421af35a09
Add helper method 2022-11-22 15:51:44 +05:30
Neeraj Gupta 5e4aee84dd
refactor 2022-11-21 14:58:17 +05:30
Neeraj Gupta 2e4167a97f
User: Helper properties to identify role 2022-11-21 07:40:42 +05:30
Neeraj Gupta 507533646f
Collection: Persist user role 2022-11-20 17:24:10 +05:30
ashilkn cd1d49f438 minor fix 2022-11-19 17:06:16 +05:30
ashilkn 9f3c693e7d bug fix : selected files thumbnail not not getting refreshed on 'cancel' 2022-11-18 17:26:39 +05:30
ashilkn bc2caac531 Merge branch 'master' into select-photos-of-day 2022-11-16 10:05:52 +05:30
Neeraj Gupta 34de3f5fc3
Merge pull request #583 from ente-io/empty_albums
Empty albums
2022-11-15 10:54:56 +05:30
ashilkn 43d48916e2 minor changes 2022-11-14 18:23:03 +05:30
ashilkn 61ecbb3321 Merge branch 'master' into select-photos-of-day 2022-11-14 10:07:42 +05:30
ashilkn 39c749a39c code refactoring 2022-11-14 10:04:22 +05:30
Neeraj Gupta 2de6562343
Do not show hide option for local only files 2022-11-11 11:53:01 +05:30
ashilkn 9223ffbe69 remove rebuild on unselecting all files + use better name 2022-11-10 17:17:05 +05:30
Neeraj Gupta 587817965d
rename method 2022-11-10 16:10:35 +05:30
Neeraj Gupta 68b5750d48
Change base date for creationTime cutoff 2022-11-10 16:07:41 +05:30
Neeraj Gupta f7c1593470
Fix creationLogic 2022-11-10 16:06:22 +05:30
Neeraj Gupta fe34ddaeae
Improve creationTime fallback logic 2022-11-10 16:00:11 +05:30
Neeraj Gupta e42a1106dc
Use current date as importTime if parsing also fails 2022-11-10 14:51:57 +05:30
Neeraj Gupta ccf09cf19f
Use improved logic for parsing dateTime from fileName 2022-11-10 14:43:21 +05:30
Neeraj Gupta bbbc61fd4e
Merge branch 'master' into empty_albums 2022-11-06 14:45:46 +05:30
Neeraj Gupta 19cc54f422
Fix lint issues 2022-11-06 13:52:54 +05:30
ashilkn 27c660771f handled cases where caption is null 2022-11-05 13:47:02 +05:30
ashilkn 6dbafb118b Merge branch 'caption_search' into caption 2022-11-05 13:29:16 +05:30