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
79780cfb3a
Add FileDragAndDropError
2015-12-08 18:22:11 +01:00
Brett Sun
04d7e6951a
Don't render fileDragAndDropDialog if it's not needed
2015-12-08 18:16:11 +01:00
Brett Sun
a0db6d3037
Shuffle uploader props to be more readable
2015-12-08 18:09:24 +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
943d62dd8c
Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark
2015-11-20 17:59:26 +01:00
Tim Daubenschütz
efcc24ab96
Make overall upload progress percentage more visible
2015-11-20 15:24:14 +01:00
Tim Daubenschütz
465bed94a2
Use overallProgress bar all the time
2015-11-20 15:14:25 +01:00
Tim Daubenschütz
96ad05cef4
Unknot (and maybe reknot) layouting for FileDragAndDrop
2015-11-20 15:02:39 +01:00
Tim Daubenschütz
1cf8ac2f31
Various small changes for FileDragAndDrop
...
Changed:
- If only one file submitted: hide file-specific progress bar + filename extension
- Fix bug for when uploaded file is deleteable (avoid error)
- Add checkmark for when file was actually submitted
2015-11-20 14:30:24 +01:00
Tim Daubenschütz
f4f89bba43
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 13:53:03 +01:00
Tim Daubenschütz
446ed311ea
Fix upload/hashing button in FileDragAndDropDialog
2015-11-19 17:51:17 +01:00
Tim Daubenschütz
1318bf5413
Fix indentation fail
2015-11-19 17:36:47 +01:00
Tim Daubenschütz
2dcd375850
Add functionality for displaying file name upon uploading single file
2015-11-19 10:43:40 +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
Brett Sun
7bc5492236
Clear previously selected files from input element when ReactS3FineUploader fails
2015-11-13 12:20:52 +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
fad6caca63
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
2015-10-21 09:47:14 +02:00
TimDaubenschuetz
5a35e40a76
Merged in AD-947-fileuploader-button-does-not-work (pull request #100 )
...
Remove stopPropagation for event in FileDragAndDrop
2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed
Fix simulate click for Opera
2015-10-19 14:22:20 +02:00
Tim Daubenschütz
f0d8e32ecf
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
TimDaubenschuetz
d66c201a98
Merged in AD-727-missing-redirects-to-login-page (pull request #95 )
...
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Tim Daubenschütz
8b23a9c74f
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
2015-10-14 17:19:01 +02:00
diminator
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +02:00
Tim Daubenschütz
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +02:00
Tim Daubenschütz
cee8d7cae7
fix bug in FileDragAndDropDialog
2015-10-09 14:22:48 +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
d888bb8a54
PR Feedback: remove unnecessary DnD functions
2015-09-16 15:52:54 +02:00
Tim Daubenschütz
3c3e32980c
minor getLangText edition
2015-09-16 15:23:01 +02:00
Tim Daubenschütz
b2a3c9545b
minor corrections
2015-09-16 14:07:55 +02:00
Tim Daubenschütz
83b20e6472
First cut: Upload button for contract settings
2015-09-15 16:35:45 +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
Tim Daubenschütz
6c8135d6ac
fix length of undefined bug in fineuploadeer
2015-09-15 13:13:58 +02:00
Tim Daubenschütz
c08f46bd69
separate FileDragAndDrop component
2015-09-15 11:13:17 +02:00
