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
Tim Daubenschütz
f2542f99bd
Merge pull request #141 from ascribe/AG-139-specific-file-formats-leads-to-wrong-preview-sizing
...
AG-139 Extract extension using file name rather that mime type for uploader preview
2016-01-28 10:03:18 +01:00
Brett Sun
627b2f75fe
Extract extension using file name rather that mime type for uploader preview
...
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
2016-01-26 13:41:15 +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
5b7a5de332
Merge with master
2016-01-19 17:02:04 +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
591882618b
Merge pull request #88 from ascribe/AD-1344-users-want-pretty-detail-page-to-print
...
AD-1344 Users want pretty detail page to print
2015-12-23 11:22:01 +01:00
Brett Sun
2dc036047f
Substitute upload button for placeholder text in print
2015-12-23 09:47:30 +01:00
Brett Sun
e3c9ebe5f3
Limit thumbnail size to 5mb
2015-12-21 11:53:27 +01:00
Brett Sun
ebd575caa3
Add prop to hide label of UploadButton
2015-12-21 11:46:46 +01:00
Brett Sun
418022dff5
wip
2015-12-21 11:40:59 +01:00
Brett Sun
8aae923388
Merge pull request #68 from ascribe/PR-hotfixes
...
PR hotfixes
2015-12-14 16:57:51 +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
be2f9bbc97
Make sure uploaded file from UploadButton has been linked with S3 before we try deleting it
2015-12-14 12:08:49 +01:00
Brett Sun
bee420a919
Small fixes for PR's otherdata fileClass
2015-12-14 11:57:10 +01:00
Brett Sun
8f98251735
Add additional comment for Safari behaviour of input's accept property
2015-12-14 11:41:06 +01:00
Brett Sun
482fa51e9e
Finalize text changes
2015-12-10 18:56:19 +01:00
Brett Sun
d5823f10ec
Use mime types for input's accept property as safari doesn't play nicely with just the extensions
2015-12-10 17:54:33 +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
17a3ecbd44
Add thin cross icon to FileDragAndDropError
2015-12-08 20:48:39 +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
5250427ce0
Use FileStatus in UploadButton, register form
2015-12-08 18:29:26 +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
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
Tim Daubenschütz
9c9c99c714
Show filename when uploading
2015-12-07 16:34:10 +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
Brett Sun
916ec7aace
Rearrange handleDrop() to flow more naturally
2015-12-02 13:52:17 +01:00
Tim Daubenschütz
fe24a5e15a
Remove all occurrences of inactivity mgmt of ReactS3Fineuploader
2015-12-02 12:37:21 +01:00
Brett Sun
4821e36189
Update FineUploader utils to use FileStatus
2015-11-25 18:58:49 +01:00
Brett Sun
dff180ff87
Use FineUploader status constants as opposed to strings
2015-11-25 16:27:32 +01:00
Tim Daubenschütz
7d4d61e2e6
Restyle progress bar and fix bug in fileSelector
2015-11-25 10:54:29 +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
56d8268ceb
Add remove button for thumbnail creation dialog
2015-11-23 12:31:53 +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
