Brett Sun
28ed1473d6
Hotfix for uploader merge error
2016-02-09 10:20:32 +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
8f98251735
Add additional comment for Safari behaviour of input's accept property
2015-12-14 11:41:06 +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
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
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
83b20e6472
First cut: Upload button for contract settings
2015-09-15 16:35:45 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
Tim Daubenschütz
b4756be60a
replace anonymous filter functions with util functions
2015-09-10 09:54:02 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00
Tim Daubenschütz
ad8be7e34a
separate pre-sending form submission functionality
2015-08-18 13:15:22 +02:00