Tim Daubenschütz
|
030a86e883
|
Merge branch 'master' into AP-7-artcity-consignment-wallet
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
|
2016-02-08 10:05:35 +01:00 |
|
Brett Sun
|
15cf6498a8
|
Remove unused Cyland hero component
|
2016-02-05 11:54:02 +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 |
|
Tim Daubenschütz
|
f12630dfad
|
Add routes and styling for artcity.ascribe.io
|
2016-02-04 13:44:45 +01:00 |
|
Tim Daubenschütz
|
f6a5734871
|
Add routes and styling for polline.ascribe.io
|
2016-02-04 10:54:38 +01:00 |
|
Tim Daubenschütz
|
b405bc675b
|
Fix PR feedback
|
2016-02-01 14:47:51 +01:00 |
|
Tim Daubenschütz
|
e2a481a3f0
|
Fix redirection of wallet owners
This also fixes a problem where newly created
users would be redirected to a 404 page.
|
2016-02-01 13:50:55 +01:00 |
|
Brett Sun
|
4dd701a414
|
Add extension validation to marketplace thumbnail uploader
|
2016-01-21 12:24:31 +01:00 |
|
Brett Sun
|
0045dc6981
|
Add anchorization to whitelabel forms
|
2016-01-20 12:31:02 +01:00 |
|
Brett Sun
|
fbc1a43bf0
|
Merge with master
|
2016-01-19 15:28:50 +01:00 |
|
Brett Sun
|
2ad2ea242d
|
Changes for PR comments
|
2016-01-18 17:31:56 +01:00 |
|
Brett Sun
|
aa00415a83
|
Merge with master
|
2016-01-18 14:15:19 +01:00 |
|
Brett Sun
|
23ccad9b5f
|
Add changes for PR comments
|
2016-01-18 13:29:08 +01:00 |
|
Brett Sun
|
621cc76e4a
|
Use template strings to join two strings together instead of join()
|
2016-01-18 11:37:11 +01:00 |
|
Brett Sun
|
78cf40ba64
|
Small cosmetic changes
|
2016-01-18 10:53:01 +01:00 |
|
Brett Sun
|
a2320b892d
|
Merge with master
|
2016-01-18 10:40:13 +01:00 |
|
Brett Sun
|
4f21b5d4d7
|
Refactor MarketSubmitButton to rely on the extra data from its given editions instead of fetching from the PieceStore
|
2016-01-15 17:56:32 +01:00 |
|
Brett Sun
|
e84206149c
|
wip
|
2016-01-15 17:18:17 +01:00 |
|
Brett Sun
|
4c4e5e0004
|
Load piece when necessary in MarketRegisterPiece
|
2016-01-15 17:18:05 +01:00 |
|
Brett Sun
|
8d9df43339
|
Clean up whitelabel AdditionalDataForms
|
2016-01-15 17:17:34 +01:00 |
|
Brett Sun
|
50129b9d0c
|
Refactor MarketSubmitButton to pull the piece as necessary rather than always fetching it in MarketAdditionalDataForm
|
2016-01-15 14:22:28 +01:00 |
|
Brett Sun
|
7a53d539a6
|
Small fixes for components using pieces and editions
|
2016-01-14 16:31:19 +01:00 |
|
Brett Sun
|
3e67e2d2ee
|
PieceId should only ever be a number if passed as a prop
|
2016-01-14 14:52:33 +01:00 |
|
Brett Sun
|
7136f2ce6c
|
Add getInitialState and source pattern for PieceStore
|
2016-01-14 13:20:45 +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
|
5b2178eb7e
|
Use height for landing page logos
Using height means the browser can allocate space for the image before
it loads, so there’s no flash of movement
|
2016-01-12 15:06:43 +01:00 |
|
Brett Sun
|
40041197d6
|
Update components for loading WhitelabelStore from top level app
|
2016-01-11 19:22:25 +01:00 |
|
Brett Sun
|
8009174787
|
Change AccordionListItems and parents for loading UserStore from top level app
|
2016-01-11 19:06:50 +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
|
8531b77633
|
Merge with master
|
2016-01-11 17:52:32 +01:00 |
|
Brett Sun
|
d4bb00168c
|
Change AclButtonList and parents for loading UserStore from top level app
|
2016-01-11 17:41:31 +01:00 |
|
Brett Sun
|
fbb35915eb
|
Update market routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:57:48 +01:00 |
|
Brett Sun
|
194c554637
|
Update Ikono routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:56:24 +01:00 |
|
Brett Sun
|
723f93e629
|
Update CC routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:28:27 +01:00 |
|
Brett Sun
|
3e66b78d4c
|
Update Cyland routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:27:03 +01:00 |
|
Brett Sun
|
cc16508e64
|
Merge with master
|
2016-01-11 11:59:35 +01:00 |
|
Brett Sun
|
4624e936b3
|
Use the new history api and its LocationDescriptors
|
2016-01-05 17:27:25 +01:00 |
|
Brett Sun
|
cf6d653c68
|
Small code style fixes
|
2015-12-23 09:33:25 +01:00 |
|
Brett Sun
|
0f8094ef55
|
Merge pull request #69 from ascribe/AD-1346-hide-piece-registration-if-cant-submit
AD-1346 Hide piece registration if user cannot submit to whitelabel
|
2015-12-17 16:44:25 +01:00 |
|
Brett Sun
|
f2f775f20c
|
Carry down currentUser as prop to MediaContainer instead of adding state
|
2015-12-16 17:49:30 +01:00 |
|
Brett Sun
|
b971d516cc
|
Fix PR feedback for Cyland loan button
|
2015-12-16 15:33:00 +01:00 |
|
Brett Sun
|
e3c4e54386
|
Reverse order of Cyland loan form buttons
Maintains consistency with other buttons on the web app.
|
2015-12-16 14:24:03 +01:00 |
|
Brett Sun
|
764b9dbf12
|
Remove leftover function from previous functionality that was removed
|
2015-12-16 12:44:50 +01:00 |
|
Brett Sun
|
7fbe8a311b
|
Use col-xs instead of col-sm to handle mobile screens on white label landing pages
|
2015-12-16 12:43:43 +01:00 |
|
Brett Sun
|
1ea89313ff
|
Add custom buttons to loan form for Cyland registration
|
2015-12-16 12:43:03 +01:00 |
|
Brett Sun
|
6cc9ce8094
|
Don't redirect to register piece and then to contract notifications
Avoids new user getting asked if they want to cancel registration of a
piece before they even agree to the Ikono contract.
|
2015-12-14 18:34:27 +01:00 |
|
Brett Sun
|
1ee9a4c7a1
|
Hide download button on the marketplace additional data form when it's not inline
|
2015-12-09 18:29:43 +01:00 |
|
Brett Sun
|
257ff9b5d3
|
Destructure params for fetchPieceList
|
2015-12-08 15:09:03 +01:00 |
|
Brett Sun
|
8f3d8fafa6
|
Change fronted instances of 23vivi to be uppercase
|
2015-12-08 12:04:01 +01:00 |
|