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
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
443be236f5
Whitespace fix for comments
2016-01-11 16:26:36 +01:00
Brett Sun
06ea23c627
Update prize routes for loading user and whitelabel settings in top level app
2016-01-11 15:14:54 +01:00
Brett Sun
cc16508e64
Merge with master
2016-01-11 11:59:35 +01:00
Brett Sun
8dfa257317
Merge pull request #96 from ascribe/AD-1503-email-link-param-prefills-not-working
...
AD-1503 Email links do not prefill fields
2016-01-11 11:29:16 +01:00
Brett Sun
19841ce6c4
Refactor EventActions and UserStore to more cleanly handle user authentication and log out events
2016-01-08 14:59:45 +01:00
Brett Sun
e76a36621e
Use correct prize_round parameter
2016-01-05 19:45:49 +01:00
Brett Sun
4624e936b3
Use the new history api and its LocationDescriptors
2016-01-05 17:27:25 +01:00
Brett Sun
0ce1633294
Add round parameter to prize ratings
2016-01-04 19:40:54 +01:00
Brett Sun
13937c9951
Fix stale prize ratings showing up on other pieces when they do not have ratings
2015-12-23 20:43:46 +01:00
Brett Sun
39730ec637
Merge with master
2015-12-23 13:17:08 +01:00
Brett Sun
591882618b
Merge pull request #88 from ascribe/AD-1344-users-want-pretty-detail-page-to-print
...
AD-1344 Users want pretty detail page to print
2015-12-23 11:22:01 +01:00
Brett Sun
cf6d653c68
Small code style fixes
2015-12-23 09:33:25 +01:00
Brett Sun
8a70f0acc5
Hotfix portfolio review cover image text to show correct 5mb limit
2015-12-22 19:37:44 +01:00
Brett Sun
b5fc811789
Merge pull request #77 from ascribe/pr-show-server-error-response
...
Show server error in failed piece registration notifications on Portfolio Review
2015-12-22 19:27:30 +01:00
Brett Sun
2bb04ff4f0
Merge pull request #86 from ascribe/AD-1530-limit-thumbnail-upload-size
...
Limit thumbnail size to 5mb
2015-12-22 19:26:58 +01:00
Brett Sun
58cd68f1c4
Change Portfolio Review closing date to be Dec. 27th
2015-12-22 10:36:05 +01:00
Brett Sun
1cf8ca006a
Move loan request action at the end of a prize to be sluice specific
2015-12-21 16:16:41 +01:00
Brett Sun
e3c9ebe5f3
Limit thumbnail size to 5mb
2015-12-21 11:53:27 +01:00
Brett Sun
8ff747e117
Componentize the action available for selected prizes
2015-12-18 14:57:52 +01:00
Brett Sun
089c4ad009
Small fixes and destructuring
2015-12-17 18:47:47 +01:00
Brett Sun
1808d38c70
Merge PrizePieceContainer from #76
2015-12-17 17:39:30 +01:00
Brett Sun
c7f272c3a3
Small fixes for DRY and React warnings
2015-12-17 17:31:33 +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
41df6fe837
Add global notification to form validation
2015-12-17 13:05:39 +01:00
Brett Sun
ad17a9d6f3
Show server error in notification if one is given for failed piece registrations
2015-12-16 18:14:06 +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
Brett Sun
5aaf02b0b4
Fire profileDidLoad event in PR to load intercom
2015-12-14 16:30:38 +01:00
Brett Sun
e24c9c9c74
Small change to PR piece registration
...
Ignore `success` return of request, as requests will error if this is
returned false.
2015-12-14 14:34:13 +01:00
Brett Sun
d0cef8c836
Add additional data fields requested by PR
...
Also adds way to sort the Properties in Prize Details by appending
`[digit]-[label]` to the Property’s name.
2015-12-14 13:03:19 +01:00
Brett Sun
3286ef77bf
Add 404 handling to prizes' piece container
2015-12-14 11:57:14 +01:00
Brett Sun
bee420a919
Small fixes for PR's otherdata fileClass
2015-12-14 11:57:10 +01:00
Brett Sun
e96e7ffa2b
Use null to denote an empty React element instead of {}
2015-12-10 18:04:46 +01:00
Brett Sun
268cbd55ad
Add logout link to submitted piece's hero component
2015-12-10 15:15:56 +01:00
Brett Sun
c9d330c2bd
Merge branch 'AD-1362-implement-portfolioreview-judging-flow' of github.com:ascribe/onion into AD-1362-implement-portfolioreview-judging-flow
2015-12-10 14:45:17 +01:00
diminator
51ff0295c0
refactor prize app to be compliant with whitelabel settings
2015-12-10 14:07:05 +01:00
Brett Sun
34153c2322
Avoid unauthorized attempts at fetching ratings if user isn't an admin, judge, or jury
2015-12-10 13:01:48 +01:00
Brett Sun
7cc51f81d0
Fix user fetch dispatch collision since the PieceContainer also fetches the user
2015-12-10 12:42:23 +01:00
Brett Sun
9b99e3ae09
Fix PR comments
2015-12-10 11:11:37 +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
Tim Daubenschütz
b31872261d
Add AuthPrizeRoleRedirect to missing routes
2015-12-09 14:00:00 +01:00
Tim Daubenschütz
0b63801d33
Merge branch 'master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 13:49:40 +01:00
Tim Daubenschütz
02bb72970d
Merge pull request #52 from ascribe/AD-1428-add-link-to-portfolio-review-website
...
Add link to portfolio review website to registration form
2015-12-08 17:23:31 +01:00
Tim Daubenschütz
32bc4b0c69
Add custom styling for PR
2015-12-08 16:43:45 +01:00
Tim Daubenschütz
7e5662676c
Add header to jury, judge and admin role
2015-12-08 15:44:46 +01:00
Tim Daubenschütz
e427429263
Implement AuthPrizeRoleRedirect
2015-12-08 15:21:20 +01:00
Brett Sun
cfae0f67c0
Fix unnecessary promise chain in PrizePieceRatings
2015-12-08 15:09:33 +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
Tim Daubenschütz
50377ba478
Generalize ProxyHandler to take arbitrary redirect functions
2015-12-08 11:17:04 +01:00
Tim Daubenschütz
7cb5fa6758
Rename AuthProxyHandler to ProxyHandler and remove default export
2015-12-08 10:38:32 +01:00
Tim Daubenschütz
e1c2c2514c
Move AuthProxyHandler one directory up
2015-12-08 10:23:37 +01:00
Tim Daubenschütz
6d5e3e1753
Add link to portfolio review website to registration form
2015-12-08 10:09:20 +01:00
Brett Sun
7fdd534bc8
Hide thumbnail creation for marketplace white labels
...
Thumbnails and marketplace images might become confusing to the user if
they are both available. In the future, we may want to change the
marketplace image to just be the thumbnail image.
2015-12-07 17:24:13 +01:00
Tim Daubenschütz
aba0747fe3
Merge pull request #30 from ascribe/AD-1313-Attach-thumbnail-to-piece-in-register-form
...
Ad 1313 attach thumbnail to piece in register form
2015-12-07 17:17:19 +01:00
Brett Sun
fd9ec413f2
Forgot to include white label piece containers in previous fix
2015-12-07 15:14:01 +01:00
Tim Daubenschütz
49421e1fa1
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
2015-12-07 13:39:30 +01:00
diminator
f76ebffbe2
fix: acl_wallet_submit on 23vivi register piece
2015-12-07 11:17:42 +01:00
Brett Sun
41ef51c478
Revert "Add consign error to market white labels"
...
This reverts commit cb972eb448
2015-12-07 10:18:08 +01:00
Brett Sun
cb972eb448
Add consign error to market white labels
...
Can you beliebe? Magical 100th commit.
2015-12-04 18:30:45 +01:00
Brett Sun
c1959033c0
Fix comments in PR
2015-12-04 16:34:25 +01:00
Brett Sun
0763c45548
Disable form when acl_edit is turned off
2015-12-04 15:35:01 +01:00
Brett Sun
9d02877363
Fix customThumbnailPlacholder propType
2015-12-04 13:52:17 +01:00
