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 |
|
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 |
|
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
|
2381bd22ac
|
Change nested destructuring formatting
|
2015-12-02 16:05:21 +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 |
|
Brett Sun
|
b4ddec3427
|
Merge with AD-1443
|
2015-11-30 11:46:57 +01:00 |
|
Brett Sun
|
3aab73379a
|
Merge with master
|
2015-11-30 11:43:33 +01:00 |
|
Brett Sun
|
3d017392c1
|
Only use previous filterBy on refreshing edition lists if no filterBy argument was given
Also fix the behaviour of refresh using the list’s current length
rather than the previous page size.
|
2015-11-30 11:32:48 +01:00 |
|
Brett Sun
|
ea52c54e3a
|
Fix check for determining if a piece's edition list is open
|
2015-11-30 11:27:15 +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 |
|
Dimitri De Jonghe
|
a21e450a93
|
Merge pull request #39 from ascribe/AD-1403-api-webhooks
webhooks in settings page
|
2015-11-27 18:04:41 +01:00 |
|
diminator
|
d03d1355ff
|
copy for webhooks
|
2015-11-27 18:02:25 +01:00 |
|
Tim Daubenschütz
|
6888aaa8d9
|
Merge pull request #37 from ascribe/AD-1345-remind-users-not-to-leave-long-submission-form
Ad 1345 remind users not to leave long submission form
|
2015-11-27 17:34:12 +01:00 |
|
Tim Daubenschütz
|
7146f00c05
|
Refactor webhooks: add source, clear state on create hide create on no items left
|
2015-11-27 13:36:42 +01:00 |
|
Tim Daubenschütz
|
4c16562b5f
|
Merge pull request #38 from ascribe/bump-rackt-history-1-13-1
Bump Rackt/History to 1.13.1
|
2015-11-27 09:41:57 +01:00 |
|
diminator
|
1c25f8e776
|
webhooks in settings without acl
|
2015-11-27 03:24:37 +01:00 |
|
Brett Sun
|
3b6481eda0
|
Bump Rackt/History to 1.13.1
Gracefully handle when sessionStorage is unavailable
|
2015-11-26 11:45:40 +01:00 |
|
Tim Daubenschütz
|
88d1edd45c
|
Add pageExitWarning for SlidesContainer
|
2015-11-25 15:01:23 +01:00 |
|
Tim Daubenschütz
|
121a1dbb8d
|
Bump react-router to 1.0.0 because of found bug
|
2015-11-25 15:00:56 +01:00 |
|
Tim Daubenschütz
|
64030473cd
|
Merge pull request #33 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title
Check for piece and edition validity by using their ids instead of titles
|
2015-11-25 11:25:42 +01:00 |
|
Brett Sun
|
c270977eb9
|
Fix default filter on piece list
|
2015-11-24 19:26:45 +01:00 |
|
Brett Sun
|
e228a4bf15
|
Dynamically get marketplace name for submit button
|
2015-11-24 18:18:49 +01:00 |
|
Brett Sun
|
47f56b5505
|
Add 23vivi to app costs
|
2015-11-24 18:17:51 +01:00 |
|