1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

2154 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
4fe10bb887 Cosmetic changes for EditionContainer & PieceContainer 2015-11-30 18:26:27 +01:00
Tim Daubenschütz
0b2bc1c57b Introduce ReactError mixin for handling errors in React components 2015-11-30 18:23:03 +01:00
Tim Daubenschütz
68f41f7550 Implement boilerplate logic for ReactError 2015-11-30 15:01:07 +01:00
Tim Daubenschütz
5a6c827f0b Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/ascribe_detail/piece_container.js
2015-11-30 15:00:39 +01:00
Tim Daubenschütz
2b6c9777e9 Display actions only if ACLs are available 2015-11-30 13:20:05 +01:00
Tim Daubenschütz
638804837e Merge pull request #41 from ascribe/make-mobile-mailbox-full-width
Make header notification full width on mobile
2015-11-30 12:01:19 +01:00
Tim Daubenschütz
6500af121a Merge pull request #36 from ascribe/AD-706-close-expandable-navigation-after-click
Bug fix for collapsing nav
2015-11-30 11:59:47 +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
720cf472c8 Make header notification full width on mobile 2015-11-28 23:37:46 +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