Tim Daubenschütz
ddfdaa30e7
Merge fixes
2015-12-07 14:01:17 +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
Brett Sun
c1959033c0
Fix comments in PR
2015-12-04 16:34:25 +01:00
Brett Sun
4b17225783
Fix padding in InputContractAgreementCheckbox
2015-12-04 13:32:29 +01:00
Tim Daubenschütz
3335032609
Finalize InputContractAgreementCheckbox
2015-12-04 12:06:08 +01:00
Tim Daubenschütz
0b79a55175
Destructure correct contractAgreement prop
2015-12-04 10:57:57 +01:00
Tim Daubenschütz
34126c2254
Fix negation of expanded prop of Property
2015-12-04 10:49:41 +01:00
Tim Daubenschütz
36041d3b51
Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett
2015-12-03 21:30:05 +01:00
Tim Daubenschütz
8ec0634d2e
Cherry-pick from 1ac2fe7f96:
...
- Integrate PropertyCollapsible's functionality to Property
2015-12-03 20:26:53 +01:00
Tim Daubenschütz
cb19c46dac
Implement PropertyCollapsible's functionality into Property
2015-12-03 20:09:27 +01:00
Brett Sun
f5a527b251
Fix references to form due to nested property elements
2015-12-03 17:19:17 +01:00
Brett Sun
9c64cf2b80
Add hot fix from AD-1313 for using refs in properties
...
https://github.com/ascribe/onion/blob/AD-1313-Attach-thumbnail-to-piece-
in-register-form/js/components/ascribe_forms/form.js
2015-12-03 17:17:52 +01:00
Brett Sun
328d60b279
Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty
2015-12-03 15:22:37 +01:00
Brett Sun
3c516c1598
Refactor contract agreement to be a self contained component that can be used in forms
2015-12-03 15:22:17 +01:00
Brett Sun
e442e6bcec
Make email input be react controlled in loan and consign forms
2015-12-03 15:21:14 +01:00
Brett Sun
e1477be393
Fix typo in PropertyCollapsible declaration
2015-12-03 13:34:24 +01:00
Brett Sun
bde1e454ed
Change loan form's startdate and enddate props to be camel case
2015-12-03 13:34:00 +01:00
Tim Daubenschütz
911860ccb5
Finalize cancel and delete functionality for UploadButton
2015-12-03 10:42:55 +01:00
Brett Sun
55bdd4e03f
Only show the label or errors part of a Property if they exist
...
Fix weird spacing for properties that don’t have labels (ie. checkboxes
for terms of service, etc)
2015-12-03 00:49:26 +01:00
Tim Daubenschütz
fe24a5e15a
Remove all occurrences of inactivity mgmt of ReactS3Fineuploader
2015-12-02 12:37:21 +01:00
Brett Sun
539c34db48
Fix typo for getDefaultProps() in consign form
2015-11-30 11:19:59 +01:00
Brett Sun
0c02c033e5
Fix consign form when labels aren't give as props
2015-11-27 23:53:54 +01:00
Brett Sun
efdc5d32e7
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
2015-11-24 10:42:15 +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
59244f208a
Fix detachment of DOM <-> browser state
2015-11-23 13:59:07 +01:00
Tim Daubenschütz
96ad05cef4
Unknot (and maybe reknot) layouting for FileDragAndDrop
2015-11-20 15:02:39 +01:00
Tim Daubenschütz
c0f5351645
Fix badly indentation
2015-11-19 18:09:42 +01:00
Tim Daubenschütz
2aab5d2d0d
Fix bug in RegisterPieceForm when defining no editions
2015-11-19 16:16:25 +01:00
Tim Daubenschütz
6d08540d8b
Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm
2015-11-19 11:45:29 +01:00
Tim Daubenschütz
399f670bed
Add variety of supported file formats & fix bug when parsing mime type
2015-11-18 17:55:27 +01:00
Tim Daubenschütz
43c6ee929b
Remove PropertyCollapsible
2015-11-18 16:32:07 +01:00
Tim Daubenschütz
25372a3edf
Include PropertyCollapsible's functionality into Property
2015-11-18 16:31:37 +01:00
Tim Daubenschütz
6d828ac959
Remove hidden prop from Property
2015-11-17 16:14:20 +01:00
Tim Daubenschütz
1ac2fe7f96
Remove all occurences of 'hidden' prop usage for Property
2015-11-17 15:52:40 +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
16840a6136
Generalize InputFineuploader's submitFileName method to submitFile
2015-11-17 11:57:18 +01:00
Tim Daubenschütz
14621b5b38
Generalize UploadButton styling
2015-11-17 11:22:24 +01:00
Tim Daubenschütz
4f0c0fe65a
Add static version of thumbnail uploader in register piece form
2015-11-17 10:38:10 +01:00
Tim Daubenschütz
e016ee7446
Merge pull request #12 from ascribe/AD-1242-Frontend-caching-using-local-storage
...
Implement functionality for feature-detecting webStorage
2015-11-16 17:37:29 +01:00
Tim Daubenschütz
ac07107210
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
...
Conflicts:
js/constants/application_constants.js
js/utils/requests.js
2015-11-16 16:38:35 +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
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
8b335cfb07
Include feedback from PR
2015-11-13 09:48:22 +01:00
Tim Daubenschütz
62f19467b7
Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine
2015-11-11 18:17:32 +01:00
Brett Sun
84e8e4612f
Autofocus message field in consignment form and use custom labels
...
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
2015-11-10 18:24:46 +01:00
Tim Daubenschütz
ea321a4a77
Finalize submission flow with validation and thumbnail creation
2015-11-10 17:35:57 +01:00
Tim Daubenschütz
aec850a905
Improve validation for non-HTML5 inputs
2015-11-10 15:51:24 +01:00
Tim Daubenschütz
62eb78ae76
Add naive & manual validation to Form
2015-11-10 13:40:34 +01:00
Brett Sun
adf0d411d6
Fetch piece data in AdditionalDetailForm
...
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
2015-11-05 11:56:17 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
