Commit graph

3723 commits

Author SHA1 Message Date
Abhinav Kumar 11a2e0c3b2
Merge pull request #464 from ente-io/zip
Upload Google Takeout
2022-04-25 11:00:06 +05:30
Abhinav 4647809916 fix UploadTypeChoiceModal closing for non action 2022-04-25 10:58:42 +05:30
Abhinav d653968fbe chnage close button 2022-04-21 16:09:37 +05:30
Abhinav e929cd95b1 fix bugs 2022-04-21 15:50:43 +05:30
Abhinav 36eab8c71b fix minor issues 2022-04-21 15:44:22 +05:30
Abhinav 636d904a24 fix
1. dropped files being cached
2. folder detected for single dropped electron file
2022-04-21 15:32:42 +05:30
Abhinav 4b597235bc cancel upload by refreshing the page 2022-04-21 11:21:27 +05:30
Abhinav d0492392d0 fix collection selector opening for zip upload 2022-04-21 01:08:09 +05:30
Abhinav 46c14c30fa udpate log 2022-04-21 01:02:23 +05:30
Abhinav 6215669cd9 add file blob creation logs for getVideoMetadata 2022-04-21 00:49:51 +05:30
Abhinav 1912d76420 fix promiseWithTimeout 2022-04-21 00:49:26 +05:30
Abhinav 7c138d8bb6 added FFMPEG_EXECUTION_WAIT_TIME 2022-04-21 00:39:09 +05:30
Abhinav 64138ce7e8 added promiseWithTimeout util 2022-04-21 00:34:55 +05:30
Abhinav 01d832f7b1 remove console log 2022-04-21 00:22:21 +05:30
Abhinav 04459e18bd reset electron files after adding them to upload 2022-04-20 22:19:07 +05:30
Abhinav fc0a6d2a83 directly start uploading zip as multiple collections 2022-04-20 20:32:01 +05:30
Abhinav cc9b4c79ed abort before clusterLivePhotoFiles if upload cancelled 2022-04-20 20:16:53 +05:30
Abhinav 1a93e73a5b remove usage of depreciated substr 2022-04-20 19:04:41 +05:30
Abhinav 5314e041e3 handle zip resumable upload 2022-04-20 18:12:35 +05:30
Abhinav a212d83492 allow resumable upload for zip too 2022-04-20 14:16:13 +05:30
Abhinav 332fdf5916 raname type to zip 2022-04-20 14:14:11 +05:30
Abhinav d52207ea70 fix zip upload choice 2022-04-19 21:10:07 +05:30
Abhinav 8717e937f4 fix styling 2022-04-19 16:38:59 +05:30
Abhinav fa9926b91f Merge branch 'master' into zip 2022-04-19 16:27:31 +05:30
Abhinav Kumar 19642555a3
Merge pull request #444 from ente-io/recover-failed-imports
desktop upload
2022-04-19 14:39:17 +05:30
Abhinav 31a522409b clear remaining files too on cancelling remaing uploads 2022-04-19 14:27:11 +05:30
Abhinav 4a3b90cdf5 Revert "handle desktop redirect using payments site"
This reverts commit 0d43c39952.
2022-04-19 13:49:14 +05:30
Vishnu Mohandas 42c08256cb
Merge pull request #486 from ente-io/enable_creation_time_fix_for_customer
Enable bulk creation-time fix for a specific customer
2022-04-19 00:12:31 +05:30
Vishnu a3b555c90e Enable bulk creation-time fix for a specific customer 2022-04-19 00:10:29 +05:30
Abhinav 7c552acd07 build fix 2022-04-18 18:55:03 +05:30
Abhinav 262c3693e4 cancel upload corectly at different stages of upload 2022-04-18 18:37:57 +05:30
Abhinav Kumar 17138416dd
Merge pull request #484 from ente-io/increase-heic-wait-time
increase heic wait time
2022-04-18 16:57:06 +05:30
Abhinav 0f6f8905a9 increase heic wait time 2022-04-18 15:56:58 +05:30
Abhinav d9f7766807 set upload in progress to false to reenable dropzone after canceling upload 2022-04-18 15:20:42 +05:30
Abhinav e6dbb77b58 handle any error on getPendingUploads fail 2022-04-18 15:06:35 +05:30
Abhinav c1ddb7d10c don't suggest name in case of file selection 2022-04-18 14:54:47 +05:30
Abhinav 2e49a2a534 open open type choice dialog on preserve button press too 2022-04-18 14:40:29 +05:30
Abhinav 354ffd741c Merge branch 'master' into recover-failed-imports 2022-04-18 14:31:23 +05:30
Abhinav f19768480a fix retry not working 2022-04-18 14:18:33 +05:30
Abhinav Kumar 312926cd1d
Merge pull request #482 from ente-io/dedupe-improvements
Dedupe improvements
2022-04-17 19:12:57 +05:30
Abhinav 17ee19b6a7 use consistent name collectionNameMap and refactor code 2022-04-17 19:02:36 +05:30
Abhinav 54fa92d7f8 quote all keys for consistency 2022-04-17 18:58:55 +05:30
Abhinav 1d5f866768 remove unneccesary code 2022-04-17 18:37:16 +05:30
Abhinav 2832c0a307 pass collection name map 2022-04-17 18:34:57 +05:30
Abhinav f9a65ff40a ellipse file and collection names 2022-04-17 18:32:08 +05:30
Abhinav 41d9b80304 improve styling 2022-04-17 15:48:11 +05:30
Abhinav bbeef9077c added sorting logic 2022-04-17 15:43:15 +05:30
Abhinav d7606de157 add file and collection name overlay 2022-04-17 15:32:56 +05:30
Abhinav c57c3f1465 sort duplicate files 2022-04-17 15:00:26 +05:30
Abhinav 0d43c39952 handle desktop redirect using payments site 2022-04-15 13:47:29 +05:30