1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

167 Commits

Author SHA1 Message Date
tim
56b7071c87 Enable Amazon S3 Accelerate 2016-04-20 15:15:59 +02:00
Brett Sun
8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun
028058a12f Small things that could only be fixed after merging 2016-02-08 11:03:41 +01:00
Brett Sun
537d6d52e8 Small fixes for warnings 2016-02-08 10:41:36 +01:00
Brett Sun
a4292f09c3 Merge with master 2016-02-05 17:06:16 +01:00
Brett Sun
acd7c0f0a3 Fix PR comments 2016-02-05 15:17:59 +01:00
Brett Sun
be081b6655 Fix check for allowed extensions in ReactS3FineUploader 2016-01-26 11:34:12 +01:00
Brett Sun
ba3c7db6cd Reorder methods in ReactS3FineUploader 2016-01-26 11:33:38 +01:00
Tim Daubenschütz
80b4e22435 Cancel dragged invalid file with proper messaging 2016-01-21 13:53:14 +01:00
Brett Sun
af59531fe7 Move fine uploader validation constants into their own file 2016-01-21 12:24:15 +01:00
Brett Sun
3e67e2d2ee PieceId should only ever be a number if passed as a prop 2016-01-14 14:52:33 +01:00
Brett Sun
e3c9ebe5f3 Limit thumbnail size to 5mb 2015-12-21 11:53:27 +01:00
Brett Sun
9342262f5c Move ignoreSentry parameter of logGlobal to be last in parameter list 2015-12-14 14:31:53 +01:00
Brett Sun
bee420a919 Small fixes for PR's otherdata fileClass 2015-12-14 11:57:10 +01:00
Brett Sun
e7cf9a44a0 Add simple check for determining if user's offline while uploading 2015-12-09 15:57:01 +01:00
Brett Sun
e0b35e0a24 Merge with master 2015-12-08 20:55:13 +01:00
Brett Sun
edeec39548 Small fixes for upload error behaviour
* Change error dialog text slightly
* Only show global notification on first error
* Only create the S3 blob if the response is successful
2015-12-08 20:25:18 +01:00
Brett Sun
5bc447ecc8 Allow warnings to be set from inside properties to change appearance 2015-12-08 18:23:02 +01:00
Brett Sun
79780cfb3a Add FileDragAndDropError 2015-12-08 18:22:11 +01:00
Brett Sun
a0db6d3037 Shuffle uploader props to be more readable 2015-12-08 18:09:24 +01:00
Tim Daubenschütz
49421e1fa1 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_forms/property.js
	js/components/ascribe_forms/property_collapsible.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
	sass/ascribe-fonts/ascribe-fonts.scss
	sass/whitelabel/wallet/cyland/cyland_custom_style.scss
2015-12-07 13:39:30 +01:00
Tim Daubenschütz
911860ccb5 Finalize cancel and delete functionality for UploadButton 2015-12-03 10:42:55 +01:00
Tim Daubenschütz
fe24a5e15a Remove all occurrences of inactivity mgmt of ReactS3Fineuploader 2015-12-02 12:37:21 +01:00
Brett Sun
dff180ff87 Use FineUploader status constants as opposed to strings 2015-11-25 16:27:32 +01:00
Tim Daubenschütz
809ca6f40a Restructure thumbnail creation functionality
- Add function in Property and Form for creating refs
- Change `handleSelectFiles` to `handleChangedFile`
- Add `setThumbnailForFile` method to `ReactS3Fineuploader`
2015-11-23 17:59:20 +01:00
Tim Daubenschütz
971d42b36d Add file-format-specific call to action for thumbnail generation 2015-11-17 15:46:46 +01:00
Tim Daubenschütz
2ffc26d703 Use destructuring for ReactS3Fineuploader props 2015-11-17 13:37:01 +01:00
Tim Daubenschütz
a8ccf13f91 Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady 2015-11-17 12:03:22 +01:00
Tim Daubenschütz
c100a3b307 Merge branch 'master' into AD-1340-add-details-video-upload-errors
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-11-16 16:33:39 +01:00
Tim Daubenschütz
e42df2bb36 Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-11-16 16:23:23 +01:00
Tim Daubenschütz
da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
Cleared all conflicts

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
dd8fe34bb6 Define more strict props & re-change method name to componentWillUpdate again 2015-11-16 15:15:55 +01:00
Brett Sun
536ce12aac Remove duplicate sentry logging on errors 2015-11-13 17:33:01 +01:00
Brett Sun
1b4bf58129 Log additional details when chunk signing fails 2015-11-13 17:32:20 +01:00
Brett Sun
8db531fb87 Add xhr details to sentry logging
FineUploader’s s3.XhrUploadHandler was also fixed to pass down the xhr
object when initiating a multipart upload fails.
2015-11-13 16:16:54 +01:00
Brett Sun
eae22a2e04 Move logging of upload errors to be before cancellation of uploads
Although logging isn’t affected by the cancelation of uploads, it may
cause confusion for readers if the uploads are cancelled before the
error is logged.
2015-11-13 16:04:55 +01:00
Brett Sun
7bc5492236 Clear previously selected files from input element when ReactS3FineUploader fails 2015-11-13 12:20:52 +01:00
Tim Daubenschütz
e6d839f6a0 Add proper validation for multiple uploaders in submission form 2015-11-12 10:46:08 +01:00
Tim Daubenschütz
62f19467b7 Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine 2015-11-11 18:17:32 +01:00
Tim Daubenschütz
deceb61c60 Implement lazy blob creation routine and increase robustness of upload button template for react-fineuploader 2015-11-09 16:58:35 +01:00
Brett Sun
49f20462f1 Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
2015-11-02 12:10:41 +01:00
Brett Sun
d23331d9b9 Remove ReactS3FineUploader's dependency on react-router's location
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.

Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.

Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Tim Daubenschütz
a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
Tim Daubenschütz
8cd4377a58 Change links in app to new react-router@1.0rc1 syntax 2015-09-30 18:30:50 +02:00
Tim Daubenschütz
b2a3c9545b minor corrections 2015-09-16 14:07:55 +02:00
Tim Daubenschütz
f16a012771 Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract
Sync with master

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-16 13:45:24 +02:00
Tim Daubenschütz
83b20e6472 First cut: Upload button for contract settings 2015-09-15 16:35:45 +02:00
Tim Daubenschütz
33ec380f4c fix minor merge conflict error 2015-09-15 14:20:30 +02:00
Tim Daubenschütz
fbbbd1de89 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
Fix merge conflicts

Conflicts:
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00