Commit graph

3751 commits

Author SHA1 Message Date
Abhinav 6109bd0e7f refactored global css 2022-04-22 12:14:16 +05:30
Abhinav 2ae387e375 add styled component theme provider 2022-04-21 20:22:01 +05:30
Abhinav 186a326eb3 setup theme provider 2022-04-21 19:54:11 +05:30
Abhinav e318facb0b add Responsive meta tag 2022-04-21 19:45:04 +05:30
Abhinav e54dc79101 adds mui and setup it with styled-component 2022-04-21 19:37:45 +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
Rushikesh Tote 83a7833b7d added context for file times 2022-04-14 12:38:01 +05:30
Abhinav Kumar d92a483530
Merge pull request #480 from ente-io/choice-modal-first-upload
show choice modal on first upload if multiple folders detected
2022-04-14 10:50:32 +05:30
Rushikesh Tote d9ce2d6eb7 rename 2022-04-14 09:44:43 +05:30
Rushikesh Tote cfb6d0080f removed unnecessary try catch 2022-04-14 09:42:20 +05:30
Rushikesh Tote dc9d34f79c added doc for electronFile 2022-04-14 09:40:22 +05:30
Abhinav ff4b9a3508 show choice modal on first upload if multiple folders attempted 2022-04-13 18:30:05 +05:30
Abhinav a6ad76adeb use if importAPIsExists check to decide opening fileuploadTypeChoice modal 2022-04-13 13:50:07 +05:30
Abhinav 3f405de8a0 fix allElectronAPIsExist for import service 2022-04-13 13:39:16 +05:30
Abhinav 37a3d551bf Revert "remove unneeded allElectronAPIsExist check"
This reverts commit 96edd9384d.
2022-04-13 13:39:14 +05:30
Rushikesh Tote 2386273767 address review comments 2022-04-13 12:20:54 +05:30
Rushikesh Tote 7838b794da fix redundant check 2022-04-13 11:00:20 +05:30
Rushikesh Tote 50930d8683 update electron API for setting files and collection 2022-04-13 10:52:10 +05:30
Rushikesh Tote 9dd823b7df fix live photo path in importService 2022-04-13 10:43:19 +05:30
Rushikesh Tote 3480d7da3f added cancel uploads button 2022-04-13 10:00:54 +05:30
Rushikesh Tote 9213af3641 fix error due to no isElectron check 2022-04-13 09:50:14 +05:30
Abhinav Kumar 1094efc8ad
Merge pull request #478 from ente-io/fix-pubMagicMetadata-update
fix public metadata update
2022-04-12 19:37:17 +05:30
Abhinav 96edd9384d remove unneeded allElectronAPIsExist check 2022-04-12 19:23:47 +05:30
Abhinav bde91417d3 rename 2022-04-12 19:20:19 +05:30
Abhinav 19a5752eff close progress bar on upload cancel 2022-04-12 19:15:53 +05:30