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

..

ascribe_file_drag_and_drop

Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh

2015-11-16 16:23:23 +01:00

ascribe_upload_button

Include feedback from PR

2015-11-13 09:48:22 +01:00

vendor

Fix FineUploader to handle cancellations in the onError() callback

2015-11-13 12:10:51 +01:00

react_s3_fine_uploader_utils.js

First cut: Upload button for contract settings

2015-09-15 16:35:45 +02:00

react_s3_fine_uploader.js

Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh

2015-11-16 16:23:23 +01:00