Commit graph

3338 commits

Author SHA1 Message Date
Neeraj Gupta 96932f22d7
Merge branch 'master' into edit-time 2021-10-27 13:25:42 +05:30
Neeraj Gupta cdd85f7675
Merge pull request #117 from ente-io/ignored_v2
Ignored File: Use device folder & title for identifying ignored files on Android
2021-10-27 13:21:12 +05:30
vishnukvmd 0bc08dda36 Add three dots 2021-10-27 12:51:40 +05:30
vishnukvmd 2b5ca27388 Style the date picker 2021-10-27 12:47:16 +05:30
Neeraj Gupta 991c5cfe2b
Merge pull request #115 from ente-io/missing_option
Add delete from ente option in fading_app_bar menu
2021-10-27 12:13:38 +05:30
Vishnu Mohandas 9b67863605
Merge pull request #118 from ente-io/deletion_notice
TrashPage: add header with msg about scheduled deletion
2021-10-27 11:35:41 +05:30
vishnukvmd 673c783233 Increase padding a bit 2021-10-27 11:35:22 +05:30
vishnukvmd 0bdd4948d9 Minor UI change 2021-10-27 11:33:51 +05:30
Neeraj Gupta e85e9cf293
TrashPage: add header with msg about scheduled deletion 2021-10-27 11:19:07 +05:30
Neeraj Gupta 44dd20cf20
IgnoredFiles: deviceFolder & title for matching on Android 2021-10-27 11:01:12 +05:30
Neeraj Gupta 2a0d60a83c
IgnoredFiles: switch to getAllLocalIDs for iOS 2021-10-27 10:37:17 +05:30
Neeraj Gupta 577af41c6d
use string interpolation 2021-10-27 10:15:31 +05:30
Neeraj Gupta 62b1de6c6a
IgnoredFilesDB: persist device folder name 2021-10-27 10:13:01 +05:30
Neeraj Gupta bf18952156
IgnoredFiles: add deviceFolder 2021-10-27 10:03:59 +05:30
Vishnu Mohandas 60fa685ce7
Merge pull request #116 from ente-io/change_log_level
Change log level to info for InvalidSyncStatusError
2021-10-26 23:20:37 +05:30
Neeraj Gupta adbe6888c4
Change log level to info for InvalidSyncStatusError 2021-10-26 22:10:49 +05:30
Neeraj Gupta 3816f15343
formatting changes 2021-10-26 20:16:58 +05:30
Neeraj Gupta b43f824215
add delete from ente option in fading_app_bar menu 2021-10-26 20:12:09 +05:30
Neeraj Gupta 2113b29d0b
use same copy for deleting from device 2021-10-26 20:03:15 +05:30
Neeraj Gupta 769b1222ff
Merge pull request #114 from ente-io/trash_improvements
Trash improvements
2021-10-26 19:59:46 +05:30
vishnukvmd eb72df33a5 Fix gallery title 2021-10-26 19:09:52 +05:30
vishnukvmd d8509c7de9 Minor string change 2021-10-26 19:06:15 +05:30
vishnukvmd 6d81d0698c More copy changes 2021-10-26 19:05:13 +05:30
vishnukvmd bf796b6530 Minor copy changes 2021-10-26 19:02:33 +05:30
vishnukvmd dc4da2b331 Remove unnecessary footer 2021-10-26 18:56:30 +05:30
vishnukvmd 296f5bcfe9 Return list instead of an iterable 2021-10-26 18:56:00 +05:30
vishnukvmd 6f8e9ee3f1 Fix type conversion error 2021-10-26 18:55:47 +05:30
Vishnu Mohandas b04b924a47
Merge pull request #113 from ente-io/fix_updated_files
Parse updated files correctly
2021-10-26 18:35:40 +05:30
vishnukvmd dcd61846a7 Parse updated files correctly 2021-10-26 18:01:36 +05:30
Neeraj Gupta 13d683c42f
minor fix 2021-10-26 17:43:20 +05:30
Neeraj Gupta c18e944459
Merge branch 'master' into edit-time 2021-10-26 17:28:45 +05:30
vishnukvmd b27ccc8d5b Merge remote-tracking branch 'origin' into bg_sync 2021-10-26 16:59:58 +05:30
Neeraj Gupta a777ece56a
swap order of delete and edit time 2021-10-26 16:37:34 +05:30
Neeraj Gupta 84d9c29f49
Allow changing both date & time 2021-10-26 16:34:41 +05:30
Neeraj Gupta aa145e0217
Support for editing date of memory 2021-10-26 16:07:14 +05:30
Neeraj Gupta eff885f696
Handle pubMetadata in trash & diff fetchers 2021-10-26 11:15:26 +05:30
Neeraj Gupta 4e492396e4
File & FilesDB: Add pubMetadata 2021-10-26 10:55:42 +05:30
Vishnu Mohandas c2037942d1
Merge pull request #111 from ente-io/empty_trash 2021-10-26 01:40:07 +05:30
Neeraj Gupta 138501388d
Support for empty trash 2021-10-25 20:27:41 +05:30
Neeraj Gupta 86de134cb5
Merge pull request #108 from ente-io/update_trash_diff
TrashSync: handle API contract changes
2021-10-25 19:16:29 +05:30
Vishnu Mohandas 3677d74307
Merge pull request #110 from ente-io/bugFix 2021-10-25 17:12:53 +05:30
Neeraj Gupta 4207633797
Fix: Add fileType in file metadata 2021-10-25 17:01:11 +05:30
Vishnu Mohandas fec4ef2ab5
Merge pull request #109 from ente-io/fix_typo 2021-10-24 09:32:50 +05:30
Neeraj Gupta 022398addc
Fix typo in _getRowForCollection 2021-10-24 09:28:08 +05:30
Neeraj Gupta 294b0219f1
TrashSync: handle API contract changes 2021-10-24 08:19:34 +05:30
vishnukvmd 3e424c1c07 Kill self on iOS when we get close to 30s of runtime 2021-10-22 23:12:35 +05:30
vishnukvmd 8865b76591 Update podfile 2021-10-22 23:03:03 +05:30
vishnukvmd 9f845518bc Merge remote-tracking branch 'origin' into bg_sync 2021-10-22 22:59:11 +05:30
Vishnu Mohandas dd8fe294d4
Merge pull request #104 from ente-io/delete_from_ente
Delete from ente only
2021-10-22 17:58:42 +05:30
Neeraj Gupta 33a64f71da
update toast text 2021-10-22 17:05:05 +05:30