Brett Sun
0a4d19677f
Merge with master
2016-02-04 14:00:03 +01:00
Brett Sun
f1b677dbd1
Use the activeRoute prop to generate route classnames on whitelabels
2016-02-04 13:32:06 +01:00
Brett Sun
6f2424d103
Rebase remerge
2016-02-04 13:32:00 +01:00
Brett Sun
e616576fa5
Hide the footer if a route has the hideFooter attribute
2016-02-04 13:31:19 +01:00
Brett Sun
764f81925b
Change children prop from react-router to only be a Element type
...
Judging by
https://github.com/rackt/react-router/blob/master/docs/API.md#children-1
and a few inspections in the code, as well as tests, the `children`
prop injected into routes can only ever be a single React Element
object.
This allows us to easily get the active route of a child (if there is
an active route) by querying the `children`’s route prop.
2016-02-04 13:31:18 +01:00
Brett Sun
4e13376d5f
Add route class names to prize app
2016-02-04 13:31:18 +01:00
Brett Sun
2661f2ba57
Standardize CoaVerify route across apps
2016-02-04 13:30:18 +01:00
Brett Sun
3c6dea3585
Merge pull request #146 from ascribe/AD-1519-visual-regression-cli
...
AD-1519 Visual regression tests
2016-02-04 12:03:50 +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
76a413cee1
Merge with master
2016-02-01 10:18:30 +01:00
Brett Sun
841cc05525
Merge with master
2016-01-29 11:35:43 +01:00
Brett Sun
7383fbb1f6
Standardize CoaVerify route across apps
2016-01-29 11:20:43 +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
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
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
86ff1f88d0
Fix small issues
2016-01-19 15:15:33 +01:00
Brett Sun
efbc605fc8
Standardize render structure across main app and white label apps
...
Also fixes some whitelabel landing pages broken from the
standardization and removes unnecessary class names
2016-01-19 15:04:46 +01:00
Brett Sun
7e1cfbb490
Add AppBase HOC to improve DRYness of functionality reused across apps
2016-01-19 15:00:50 +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
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
e7c29d0d98
Cyland Admin should also not be able to register work
...
As per (AD-1504)[https://ascribe.atlassian.net/browse/AD-1504 ], Cyland
admin should not be able to register work, but instead use another
account to get loaned work.
2015-12-16 13:59:31 +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
1de06b0ac5
Only show register work route if user can submit to wallet for IkonoTV, Lumenus
2015-12-14 18:59:10 +01:00
Brett Sun
b3b94b6f60
Fix spacing of WalletRoutes
2015-12-14 18:58:33 +01:00
Brett Sun
08025cc427
Remove unused showAddWork property from Header
2015-12-14 18:58:05 +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
