Brett Sun
|
c9949f0cc0
|
Merge pull request #47 from ascribe/AD-1149-additional-details
AD-1149 Contract agreement in consign forms
|
2015-12-04 13:38:18 +01:00 |
|
Brett Sun
|
4b17225783
|
Fix padding in InputContractAgreementCheckbox
|
2015-12-04 13:32:29 +01:00 |
|
Tim Daubenschütz
|
510318c319
|
Fix styling issues related to Panel in Property
|
2015-12-04 12:28:11 +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
|
5a05a029b7
|
Merge branch 'AD-1149-additional-details' of github.com:ascribe/onion into AD-1149-additional-details
|
2015-12-03 21:30:48 +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
|
854b642de8
|
Merge with main AD-1149 branch
|
2015-12-03 17:48:33 +01:00 |
|
Brett Sun
|
e69dfeb355
|
Revert "Merge with AD-1443"
Revert https://github.com/ascribe/onion/pull/40, as that needs more
work.
|
2015-12-03 17:43:15 +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
|
5772a5ad49
|
Style thumbnail upload button for whitelabels
|
2015-12-03 13:29:37 +01:00 |
|
Brett Sun
|
3f3ba50aa5
|
Merge with main AD-1149 branch
|
2015-12-03 12:51:47 +01:00 |
|
Brett Sun
|
78b8887fbf
|
Fix Cyland landing page
Fix font family to be Gibson, center vertically.
|
2015-12-03 12:44:12 +01:00 |
|
Brett Sun
|
43916625bd
|
Remove header from white labels that have landing pages
|
2015-12-03 12:41:59 +01:00 |
|
Brett Sun
|
cec652551e
|
Add 23vivi landing page
|
2015-12-03 12:41:27 +01:00 |
|
Brett Sun
|
0084dbb8e4
|
Change piece filter text to be normal font-weight
|
2015-12-03 11:54:23 +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 |
|
Brett Sun
|
61908a82f6
|
Fix prop type for MarketAdditionalDataForm's submitLabel
|
2015-12-03 00:48:21 +01:00 |
|
diminator
|
dafdf97678
|
Merge branch 'AD-1149-implement-lumenus-the-lumen-mark' of github.com:ascribe/onion into AD-1149-implement-lumenus-the-lumen-mark
|
2015-12-02 21:44:12 +01:00 |
|
diminator
|
565bf308ae
|
tested and fixed ikonotv
|
2015-12-02 21:42:35 +01:00 |
|
Brett Sun
|
3be033cdd5
|
Add thumbnail placeholder for 23vivi
|
2015-12-02 19:31:50 +01:00 |
|
diminator
|
743c11df5b
|
fixed cyland/ikono serializers
|
2015-12-02 18:56:48 +01:00 |
|
Brett Sun
|
594853535b
|
Fix trailing comma from previous PR merge
Turns out this is actually illegal in ES6 but on some version of babel,
they don’t care.
Might be an ES7 thing though:
http://www.2ality.com/2015/11/trailing-comma-parameters.html
|
2015-12-02 18:28:30 +01:00 |
|
Brett Sun
|
c0b96a8616
|
Merge pull request #45 from ascribe/AD-1149-set-default-name-for-marketplace
AD -1149 Set default name for marketplace until whitelabel name loads
|
2015-12-02 18:26:00 +01:00 |
|
Brett Sun
|
4664a48898
|
Change additional form's button text when not in registration flow
|
2015-12-02 18:18:20 +01:00 |
|
Brett Sun
|
ed6b80df89
|
Fix weird word breaks on edition action panel
|
2015-12-02 17:54:31 +01:00 |
|
Tim Daubenschütz
|
8fcb7fcb01
|
Fix render bug for personal piece note
|
2015-12-02 16:51:56 +01:00 |
|
Tim Daubenschütz
|
81f28a02f9
|
Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null
|
2015-12-02 16:39:18 +01:00 |
|
Brett Sun
|
2381bd22ac
|
Change nested destructuring formatting
|
2015-12-02 16:05:21 +01:00 |
|
Brett Sun
|
384d597405
|
First cut of 23vivi styling
|
2015-12-02 14:47:19 +01:00 |
|
Brett Sun
|
8e837f8149
|
Make dropdown items have padding inside them as opposed to outside margin
Avoids weird highlighting when the items are selected.
|
2015-12-02 14:47:03 +01:00 |
|
Tim Daubenschütz
|
d01acea9ce
|
Nicer formatting for long parametrized function
|
2015-12-02 14:34:31 +01:00 |
|
Brett Sun
|
ad736ad12f
|
Remove unnecessary hover styling on the edition list widget
|
2015-12-02 14:32:34 +01:00 |
|
Tim Daubenschütz
|
123e2a4d13
|
Add functionality to avoid sending error messages to sentry
|
2015-12-02 14:31:42 +01:00 |
|
Brett Sun
|
07834414c7
|
Set default name for marketplace wallets to be 'Market' until the white label name loads
|
2015-12-02 14:26:15 +01:00 |
|
Brett Sun
|
8f14b27eac
|
Merge pull request #43 from ascribe/AD-1149-fix-comments-in-pr
Ad 1149 fix comments in pr
|
2015-12-02 14:22:25 +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 |
|
Tim Daubenschütz
|
8b3060d613
|
Fix simple comments in pr
|
2015-12-02 12:25:11 +01:00 |
|
Tim Daubenschütz
|
85340a9126
|
Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay
|
2015-12-02 12:23:38 +01:00 |
|