Brett Sun
a4292f09c3
Merge with master
2016-02-05 17:06:16 +01:00
Brett Sun
01b258334a
Fix register work visual test
2016-02-05 14:21:31 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
2ad2ea242d
Changes for PR comments
2016-01-18 17:31:56 +01:00
Brett Sun
b22ae7def1
Small bug fixes for components affected by the UserStore and WhitelabelStore being passed down as a prop
2016-01-12 15:07:38 +01:00
Brett Sun
4133922f31
Fix a few small additions/deletions with UserActions
2016-01-11 19:10:24 +01:00
Brett Sun
d867a3d9c1
Change SignupForm for loading UserStore from top level app
2016-01-11 18:24:55 +01:00
Brett Sun
1c4ca0d152
Change RegisterPieceForm and parents for loading UserStore from top level app
2016-01-11 18:16:46 +01:00
Brett Sun
58f57af932
Remove unused props in LoginForm
2016-01-11 18:07:52 +01:00
Brett Sun
8531b77633
Merge with master
2016-01-11 17:52:32 +01:00
Brett Sun
b5fc811789
Merge pull request #77 from ascribe/pr-show-server-error-response
...
Show server error in failed piece registration notifications on Portfolio Review
2015-12-22 19:27:30 +01:00
Brett Sun
e3c9ebe5f3
Limit thumbnail size to 5mb
2015-12-21 11:53:27 +01:00
Brett Sun
41df6fe837
Add global notification to form validation
2015-12-17 13:05:39 +01:00
Brett Sun
f4227e9906
Update form's email state if the email prop changes
2015-12-16 15:17:47 +01:00
Brett Sun
1ea89313ff
Add custom buttons to loan form for Cyland registration
2015-12-16 12:43:03 +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
d0cef8c836
Add additional data fields requested by PR
...
Also adds way to sort the Properties in Prize Details by appending
`[digit]-[label]` to the Property’s name.
2015-12-14 13:03:19 +01:00
Brett Sun
38ef18a192
Hotfix for sending contract agreements without appendices
2015-12-11 11:15:17 +01:00
Brett Sun
e0b35e0a24
Merge with master
2015-12-08 20:55:13 +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
a0db6d3037
Shuffle uploader props to be more readable
2015-12-08 18:09:24 +01:00
Brett Sun
7fdd534bc8
Hide thumbnail creation for marketplace white labels
...
Thumbnails and marketplace images might become confusing to the user if
they are both available. In the future, we may want to change the
marketplace image to just be the thumbnail image.
2015-12-07 17:24:13 +01:00
Tim Daubenschütz
3681260054
Return empty string if file without extension is submitted
2015-12-07 17:14:43 +01:00
Tim Daubenschütz
56d8726a0b
Minor changes for integrating PR Feedback
2015-12-07 17:02:53 +01:00
Tim Daubenschütz
343d6bfea2
Fix a bug that locked submit button in disabled mode
2015-12-07 16:58:26 +01:00
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