Commit graph

6185 commits

Author SHA1 Message Date
Neeraj Gupta 6f386640d2
Merge branch 'master' into collaboration_view 2022-11-24 12:02:47 +05:30
Neeraj Gupta cb8962f011 bump version to 0.6.70+390 2022-11-24 10:25:31 +05:30
Neeraj Gupta 614c98a40d
Merge pull request #668 from ente-io/minor_fix_sync_status
Bugfix: Fix incorrect value for  selectedAll folders flag
2022-11-24 10:20:42 +05:30
Neeraj Gupta 06296051c1
Fix typo 2022-11-24 10:08:06 +05:30
Neeraj Gupta ac539fa4b5
Fix bug where hasMarkedAllFolder was set incorrectly 2022-11-24 10:06:25 +05:30
Neeraj Gupta 03bd1b65a8
Merge pull request #667 from ente-io/update-gitignore
Untrack .vscode/
2022-11-24 10:05:17 +05:30
Neeraj Gupta 0bf87f4042
Fix bug where hasMarkedAllFolder was set incorrectly 2022-11-24 10:04:03 +05:30
ashilkn b27d73a69e untrack .vscode/ 2022-11-23 21:36:25 +05:30
Ashil 9b751bab63
Merge pull request #666 from ente-io/change_log_dismiss
ChangeLog: Disable dismiss on swipe down
2022-11-23 21:23:08 +05:30
ashilkn 1515495aed minor UI fix specific to android 2022-11-23 21:22:34 +05:30
Neeraj Gupta 3bc398c6b8
Add people: Remove elevatedBackground color 2022-11-23 19:13:52 +05:30
Neeraj Gupta 0b804c6e08
disable drag to dismiss 2022-11-23 13:24:02 +05:30
Ashil 1417ceac5a
Merge pull request #664 from ente-io/bug_fixes
Minor improvements and fixes
2022-11-23 11:24:29 +05:30
ashilkn 25195e369c make toggleValue nullable 2022-11-23 11:23:37 +05:30
Neeraj Gupta 7cee5e1b70
Merge remote-tracking branch 'origin/master' into bug_fixes 2022-11-23 11:20:23 +05:30
Neeraj Gupta 28a9cd9dce
Merge pull request #665 from ente-io/change_2
Add change log
2022-11-23 10:58:21 +05:30
Neeraj Gupta cf2ad989ff
minor fix 2022-11-23 09:14:22 +05:30
Neeraj Gupta f17d8813a7
Add change log 2022-11-23 09:09:52 +05:30
Neeraj Gupta ef306d5925
Minor fix 2022-11-23 08:59:17 +05:30
Neeraj Gupta e5615ac17b
Fix critical bug in syncing folder 2022-11-23 08:58:57 +05:30
Neeraj Gupta 1ce7097ec9
Show UserAvator icon for incoming photos 2022-11-23 08:46:55 +05:30
Neeraj Gupta 86fc75aed9
Tweak UserAvatar UI 2022-11-23 08:35:37 +05:30
Neeraj Gupta 9885cd9636
Minor fix 2022-11-23 07:33:13 +05:30
Neeraj Gupta 1052b3c034
Show collab collections in add to list 2022-11-23 07:33:04 +05:30
Neeraj Gupta 14dbc28284
Add flag to return collaborative albums 2022-11-23 07:24:43 +05:30
Neeraj Gupta d72fc57d80
Add with correct role 2022-11-22 23:40:43 +05:30
Neeraj Gupta 6fca3883ea
Allow album owner to change role 2022-11-22 23:36:32 +05:30
Neeraj Gupta df9d5d5771
Support for adding as collaborator 2022-11-22 23:13:36 +05:30
Neeraj Gupta 54eef4f112
Add enum for collection participant 2022-11-22 21:23:50 +05:30
Neeraj Gupta af45eacd1f
Fix critical bug in syncing folder 2022-11-22 21:04:10 +05:30
Neeraj Gupta 0002ce2520
Merge branch 'bug_fixes' into collaboration_view 2022-11-22 19:48:09 +05:30
Neeraj Gupta 2e53ac6635
Add delay in refreshing 2FA status on appStart 2022-11-22 19:45:38 +05:30
Neeraj Gupta 72e056bc54
Fix: Fetch 2FA status when account is configured 2022-11-22 19:40:56 +05:30
Neeraj Gupta 4aef0f0323
Hook up UI elements 2022-11-22 17:03:34 +05:30
Neeraj Gupta 4cea0ea1ce
Allow add/managing users from participants page 2022-11-22 16:36:59 +05:30
Neeraj Gupta 02dd193c50
Copy change
Signed-off-by: Neeraj Gupta <254676+ua741@users.noreply.github.com>
2022-11-22 16:36:38 +05:30
Neeraj Gupta 271f3ce294
Fix add to collection state refresh issue 2022-11-22 16:35:31 +05:30
Neeraj Gupta 8068d920cf
Integrate add to collection api in new UI 2022-11-22 16:16:51 +05:30
Neeraj Gupta 0f181fac7e
Add UI to list collection participants 2022-11-22 15:53:45 +05:30
Neeraj Gupta 421af35a09
Add helper method 2022-11-22 15:51:44 +05:30
Neeraj Gupta 9f84a49952
Fix BadElement: use firstOrNull instead of first 2022-11-22 14:13:40 +05:30
Neeraj Gupta 49c3922a1f
Fix: invoke super.dispose() 2022-11-22 14:10:57 +05:30
Neeraj Gupta 4515a21a73
Fix icons 2022-11-22 14:04:39 +05:30
Neeraj Gupta 1300007ac1
Minor UI tweaks 2022-11-22 13:50:05 +05:30
Neeraj Gupta dcb64c96cf
SharingPage: Highlight expired links 2022-11-22 13:40:58 +05:30
Neeraj Gupta 31cd07845e
Update copy 2022-11-22 13:32:54 +05:30
Neeraj Gupta db796c4522
Album: Confirm removal 2022-11-22 12:42:18 +05:30
Neeraj Gupta 6a9c4c8f6e
Remove unused code 2022-11-22 12:09:48 +05:30
Neeraj Gupta 5cfa5f5337
UI and state fixes for Add people page 2022-11-22 12:02:44 +05:30
Neeraj Gupta 4425bcbe73
Add people: Add email field 2022-11-22 10:43:32 +05:30