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
40894cfea6
Use the 'ascribe-app' class for all apps
...
Simplifies testing so we can just look for a single class throughout
all the apps when ensuring React has loaded our app
2016-02-05 14:22:42 +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
1091e76447
Clean up the prize AccordionList and fix merge bug
2016-02-05 10:39:46 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Tim Daubenschütz
0a17ec0414
Use whitelabel routes for wl-specific requests
2016-02-04 14:45:46 +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
7dfe6a51a4
For 23vivi, switch back to appropriate piece list
2016-02-04 11:51:54 +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
Tim Daubenschütz
83eadf8528
Merge pull request #119 from ascribe/AG-109-marketplace-thumbnail-uploader-does-not-use-validation
...
AG-109 Marketplace thumbnail uploader does not use validation
2016-01-26 11:58:51 +01:00
Tim Daubenschütz
d8f2423344
Merge pull request #95 from ascribe/add-default-should-redirect
...
Collection should redirect to Register Work when a user does not have pieces yet
2016-01-26 11:08:32 +01:00
Tim Daubenschütz
3d43cd8505
Remove 'disabledOn' for prize routes
2016-01-26 11:07:41 +01:00
Brett Sun
27f1b7e9b4
Add default redirect for empty collections
2016-01-21 16:47:57 +01:00
Brett Sun
9559bc09b4
Disable 'Collection' header item when no pieces are found for the user
...
The disabling only happens when the piece list is fetched, which may
not happen immediately in some cases (ie. logged in user goes straight
to another person’s edition first). We’re not able to fetch the piece
list immediately, as some white labels apply default filters on the
piece list which forces them to wait until they can begin fetching
their piece lists.
2016-01-21 16:47:35 +01:00
Brett Sun
4dd701a414
Add extension validation to marketplace thumbnail uploader
2016-01-21 12:24:31 +01:00
Brett Sun
af59531fe7
Move fine uploader validation constants into their own file
2016-01-21 12:24:15 +01:00
Brett Sun
0045dc6981
Add anchorization to whitelabel forms
2016-01-20 12:31:02 +01:00
Brett Sun
c6afea2583
Calculate max thumbnail size instead of hard coding it on the registration form
2016-01-19 16:54:08 +01:00
Brett Sun
2e8d1faaca
Remove duplicate onRatingClick missed during merge
2016-01-19 15:59:43 +01:00
Brett Sun
d0d4f773c8
Re-add missed fetch for prize during merge
2016-01-19 15:57:49 +01:00
Brett Sun
f93cd93eff
Merge with master
2016-01-19 15:53:51 +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
466872affb
Move getInitialState() to be the first function after a store's constructor
2016-01-13 17:13:44 +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
315e5f0108
Add .isRequired to App proptypes
2016-01-12 15:05:00 +01:00
Brett Sun
40041197d6
Update components for loading WhitelabelStore from top level app
2016-01-11 19:22:25 +01:00
Brett Sun
4133922f31
Fix a few small additions/deletions with UserActions
2016-01-11 19:10:24 +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
d4064ee83a
Change Header and parents for loading UserStore from top level app
2016-01-11 18:41:07 +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
