Commit graph

6658 commits

Author SHA1 Message Date
Manav 3170cf48c0 Pass the localizations to the Material App created in AppLock
Will be needed in the future when we start accessing the context in showDialog
children. For more details, see the sibling auth PR
https://github.com/ente-io/auth/pull/29.
2023-01-08 16:33:13 +05:30
Manav c1634e3fb2
Merge pull request #788 from ente-io/add-cla
Add CLA
2023-01-07 19:47:48 +05:30
Manav e7693d58b8 Add CLA
Sibling PR on auth: https://github.com/ente-io/auth/pull/11

Have also added @enteio's PAT to the GitHub secrets for this repo (needed by
this action).
2023-01-07 18:59:06 +05:30
Neeraj Gupta 49baed1119
Merge pull request #785 from ente-io/bump_verison_405
Bump version to 0.7.5+405
2023-01-07 16:59:48 +05:30
Neeraj Gupta 1250b7e4e4
bump version to 0.7.5+405 2023-01-07 16:33:38 +05:30
Ashil 7cbfc37124
Merge pull request #784 from ente-io/fix_picker_ui
Fix picker UI bugs due system and app theme mismatch
2023-01-07 16:31:07 +05:30
Neeraj Gupta c502b26246
Fix link expiry selection ui 2023-01-07 16:26:08 +05:30
Neeraj Gupta 58686f84d0
Fix grid size picker ui 2023-01-07 16:25:43 +05:30
Neeraj Gupta cd2aba6480
Merge pull request #783 from ente-io/change_log_4
Add change log for upcoming release
2023-01-07 16:06:10 +05:30
Vishnu Mohandas c185d7c018
Merge pull request #782 from ente-io/useAsync
Switch to async variants
2023-01-07 16:04:59 +05:30
Neeraj Gupta 08c317fe2a
Merge branch 'main' into change_log_4 2023-01-07 16:03:23 +05:30
Neeraj Gupta 5c8cdd2bb0
Rate Us: Open playstore app for rating with fallback to https url 2023-01-07 16:02:24 +05:30
Neeraj Gupta 1d490e20b9
Add changelog 2023-01-07 15:47:23 +05:30
Ashil 6b17a8b5e3
Merge pull request #780 from ente-io/reset-ignored-files
Reset ignored files
2023-01-07 09:28:22 +05:30
Ashil 516e781cd3
Merge pull request #781 from ente-io/add_icons_debug
[Debug] Add icons for uploaded and on device files
2023-01-07 09:27:47 +05:30
Neeraj Gupta 66879dd370
ThumbnailUtil: switch to async methods 2023-01-07 09:23:00 +05:30
Neeraj Gupta a9b9ffc736
Use async variante instead of sync 2023-01-07 09:12:56 +05:30
Neeraj Gupta 083933bf8d
Fix: Ignore auto-upload for files deleted from ente 2023-01-06 21:26:12 +05:30
Neeraj Gupta f51d6ebd59
Add icons for uploaded and on device files in debugMode 2023-01-06 21:23:48 +05:30
ashilkn c2175d6d24 Code refactoring 2023-01-06 20:34:20 +05:30
ashilkn 2ff3232de0 Added better animation for 'Reset ignore files' container 2023-01-06 20:22:34 +05:30
ashilkn 72ebeba3ba Merge branch 'main' into reset-ignored-files 2023-01-06 17:24:04 +05:30
ashilkn b40b1620ff Show 'Reset ignored files' only if backup is enabled 2023-01-06 17:20:24 +05:30
ashilkn 42296adb0d Hide 'Reset ignored files' after sync 2023-01-06 16:57:53 +05:30
ashilkn c7f0cce5dc Added animation and handled error for reset ignored files 2023-01-06 16:51:46 +05:30
ashilkn 04725638a1 Show reset ignore files option only if ignored files exists in the device collection 2023-01-06 15:20:22 +05:30
Neeraj Gupta 0f18757dc9
Merge pull request #779 from ente-io/delete_fixes
Fix: autoclose photo view if photo is delete from everywhere
2023-01-06 14:41:01 +05:30
Neeraj Gupta 579d1248cf
Fix: autoclose photo view if photo is delete from everywhere 2023-01-06 14:09:20 +05:30
ashilkn 304e00eb2f Added option to reset ignored files in a device collection and sync 2023-01-06 13:37:50 +05:30
Neeraj Gupta ac8eb5fdad
Merge pull request #776 from ente-io/bug_fixes
Trash/Restore: Bug fixes
2023-01-06 13:25:27 +05:30
Neeraj Gupta 160e90d322
Merge pull request #778 from ente-io/delete_states
Delete file(s): Switch to new actionSheet
2023-01-06 13:25:14 +05:30
Neeraj Gupta d8b6e76fad
Switch to new delete action sheet 2023-01-06 12:54:00 +05:30
Neeraj Gupta 0d1d3bc803
Fix: Add cancel option for file delete prompts 2023-01-06 12:35:33 +05:30
Neeraj Gupta a39a422b22
Switch to new action sheet while deleting single file 2023-01-06 12:21:47 +05:30
ashilkn 6b5f2a5fec Add pressed state for menuItem by default if onTap or onDoubleTap is passed 2023-01-06 11:45:17 +05:30
ashilkn 55949e5045 Dyamically change menu section description on updating device folder sync status 2023-01-06 11:24:34 +05:30
Neeraj Gupta d4126851f5
Merge pull request #777 from ente-io/actionSheetBodyHighlight
ActionSheet: Support for body highlight
2023-01-06 11:16:10 +05:30
Neeraj Gupta 106aa638e1
ActionSheet: Support for body highlight 2023-01-06 11:14:25 +05:30
Neeraj Gupta 54d14627b7
Fix: Local id value for trash diff 2023-01-06 10:49:46 +05:30
Neeraj Gupta b3bc236139
Fix mapping of files during restore 2023-01-06 10:47:00 +05:30
Neeraj Gupta 1d081795eb
Fix: Conditional check for null value 2023-01-06 10:22:19 +05:30
ashilkn 4370d5352b Redesigned sync device folder container 2023-01-06 10:20:25 +05:30
Neeraj Gupta 0d95b8bc17
Merge pull request #775 from ente-io/remove_redundant_code
iOS: Clean up the code fore password reminder
2023-01-05 20:04:37 +05:30
Neeraj Gupta 0d117a7752
iOS: Clean up the code fore password reminder 2023-01-05 20:00:41 +05:30
Neeraj Gupta 4a6ed365bd
Merge pull request #774 from ente-io/edited-files-sync-bug-2
Edited files sync bug 2
2023-01-05 16:26:26 +05:30
ashilkn f08c447c61 Bug fix 2023-01-05 16:04:12 +05:30
ashilkn e9eb22c878 Stop notifiying local asset changes to avoid race condition 2023-01-05 15:43:55 +05:30
ashilkn b876ae0698 Removed tracking of edited files 2023-01-05 15:32:00 +05:30
Neeraj Gupta 3b8e98dba7
Merge pull request #773 from ente-io/fix_custom_time_bug
Minor bug fixes
2023-01-05 14:21:56 +05:30
Neeraj Gupta a2256ecfb3
Fix typo in toast util 2023-01-05 14:13:16 +05:30