1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

1872 Commits

Author SHA1 Message Date
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
cef2785438 Hot fix to show edition even if not logged on 2015-12-14 17:00:04 +01:00
Brett Sun
8aae923388 Merge pull request #68 from ascribe/PR-hotfixes
PR hotfixes
2015-12-14 16:57:51 +01:00
Brett Sun
33db8e2cbe Merge pull request #67 from ascribe/AD-1362-implement-portfolioreview-judging-flow
Use mime types for <input>'s accept property
2015-12-14 16:32:14 +01:00
Brett Sun
5aaf02b0b4 Fire profileDidLoad event in PR to load intercom 2015-12-14 16:30:38 +01:00
Brett Sun
d9615188b0 Only assume TypeError if request's response is null 2015-12-14 14:54:57 +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
9342262f5c Move ignoreSentry parameter of logGlobal to be last in parameter list 2015-12-14 14:31:53 +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
be2f9bbc97 Make sure uploaded file from UploadButton has been linked with S3 before we try deleting it 2015-12-14 12:08:49 +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
8f98251735 Add additional comment for Safari behaviour of input's accept property 2015-12-14 11:41:06 +01:00
Brett Sun
38ef18a192 Hotfix for sending contract agreements without appendices 2015-12-11 11:15:17 +01:00
Brett Sun
6e9b1ac181 Hotfix for header accessing undefined ref
Sometimes `onRouteChange()` is triggered before the component’s refs
are available, so we have to check for them before setting their state.
2015-12-10 19:19:01 +01:00
Brett Sun
d5823f10ec Use mime types for input's accept property as safari doesn't play nicely with just the extensions 2015-12-10 17:54:33 +01:00
Brett Sun
b9e41d5cba Use mergeOptions instead of Object.assign when merging sources to check for clashes 2015-12-10 15:42:33 +01:00
Brett Sun
b126de5c2d Add empty object defaults to stores that use sources
Avoids inconsistent state where the store might set `null` or
`undefined` due to the server’s response
2015-12-10 15:41:55 +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
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
diminator
3461a28f36 Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 16:48:33 +01:00
Tim Daubenschütz
8278f5404f Increase robustness of:
- PieceListToolbarOrderWidget
	- PieceListToolbarFilterWidget
2015-12-09 16:17:08 +01:00
Tim Daubenschütz
80df66ea5b Merge branch 'master' into AD-1484-hide-PieceListToolbarFilterWidget-if-no-filters-applicable 2015-12-09 16:11:05 +01:00
Tim Daubenschütz
02af024609 Cosmetic changes in EditionContainer and CoaVerifyContainer 2015-12-09 15:56:47 +01:00
Brett Sun
7605f093ab Fix Request error case 2015-12-09 14:44:31 +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
3e8e7a40e7 Fix setState warning for EditionContainer 2015-12-09 13:28:11 +01:00
Tim Daubenschütz
057a278d19 In EditionStore use empty object instead of null as default state 2015-12-09 13:21:55 +01:00
Tim Daubenschütz
2a251897d5 Split EditionSource up into CoaSource and EditionSource 2015-12-09 13:18:07 +01:00
Tim Daubenschütz
fb8111fadc Merge branch 'AD-290-coa-buttons-and-usage-esp-verify' of github.com:ascribe/onion into AD-290-coa-buttons-and-usage-esp-verify 2015-12-09 13:04:27 +01:00
Tim Daubenschütz
03481f3b09 Fix bug: Old edition HTTP request holds loading data for new edition request 2015-12-09 13:04:15 +01:00
diminator
02a9844ed7 Merge remote-tracking branch 'remotes/origin/master' into AD-290-coa-buttons-and-usage-esp-verify 2015-12-09 11:42:22 +01:00
diminator
7318d4e5df embed in edition 2015-12-09 11:41:46 +01:00
Tim Daubenschütz
de3d3e937e Throw no 'Client Request Error' when body.success is not available 2015-12-09 11:24:11 +01:00
diminator
4e3cf47d3f Merge branch 'AD-290-coa-buttons-and-usage-esp-verify' of github.com:ascribe/onion into AD-290-coa-buttons-and-usage-esp-verify 2015-12-08 18:17:30 +01:00
diminator
8226011e8a query_params in coa_verify 2015-12-08 18:17:08 +01:00
Tim Daubenschütz
4727646654 Add nice message for waiting user 2015-12-08 17:43:19 +01:00
Tim Daubenschütz
e8d5e0390d Improve robustness for server-side failing requests for COA 2015-12-08 17:38:04 +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
Brett Sun
f9e7355704 Add FAQ to footer 2015-12-08 17:18:03 +01:00
Tim Daubenschütz
d035f1e41c Hide PieceListToolbarFilterWidget when no filters are applicable 2015-12-08 16:49:06 +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
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Tim Daubenschütz
da75353b00 Refactor Edition endpoints to create Coa on demand properly 2015-12-08 13:28:47 +01:00
Brett Sun
8f3d8fafa6 Change fronted instances of 23vivi to be uppercase 2015-12-08 12:04:01 +01:00
Tim Daubenschütz
bf6b78c058 Revert "coa flush causes dispatcherror"
This reverts commit eaed301155.
2015-12-08 11:49:03 +01:00
diminator
eaed301155 coa flush causes dispatcherror 2015-12-08 11:46:30 +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
Tim Daubenschütz
b8c58aa900 Add hotfix: do not unlisten history.js object 2015-12-07 17:41:10 +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
23556b1b4c Merge pull request #34 from ascribe/add-pause-resume-to-global-notifications
Implement pause and resume functionality to global notifications
2015-12-07 17:22:02 +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
Tim Daubenschütz
3681260054 Return empty string if file without extension is submitted 2015-12-07 17:14:43 +01:00
Tim Daubenschütz
56d8726a0b Minor changes for integrating PR Feedback 2015-12-07 17:02:53 +01:00
Tim Daubenschütz
343d6bfea2 Fix a bug that locked submit button in disabled mode 2015-12-07 16:58:26 +01:00
Tim Daubenschütz
9c9c99c714 Show filename when uploading 2015-12-07 16:34:10 +01:00
Brett Sun
fd9ec413f2 Forgot to include white label piece containers in previous fix 2015-12-07 15:14:01 +01:00
Brett Sun
75e010f3fb Fix global notifications not showing initial transition 2015-12-07 14:31:18 +01:00
Tim Daubenschütz
ddfdaa30e7 Merge fixes 2015-12-07 14:01:17 +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
Tim Daubenschütz
2b6b78310c Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio
AD-1177 display 404 on pieces and editio
2015-12-07 11:49:39 +01:00
Tim Daubenschütz
3ce63c33bf Finalize ReactError component 2015-12-07 11:48:28 +01:00
Tim Daubenschütz
0a67766aba Include PR Feedback: Check if Error.captureStackTrace is available 2015-12-07 11:32:04 +01:00
diminator
f76ebffbe2 fix: acl_wallet_submit on 23vivi register piece 2015-12-07 11:17:42 +01:00
Tim Daubenschütz
45919f93a6 Merge pull request #32 from ascribe/AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null
Ad 1342 public piece note doesnt render correctly def data null
2015-12-07 11:00:39 +01:00
Tim Daubenschütz
4f39103baf Use Oops 2015-12-07 10:59:07 +01:00
Tim Daubenschütz
3374862edf Make monkeyPatched key specific to component's displayName 2015-12-07 10:57:49 +01:00
Brett Sun
d2aba04bea Change show condition on public note to be more stylistically similar 2015-12-07 10:52:00 +01:00
Tim Daubenschütz
2130b74a96 Merge pull request #42 from ascribe/AD-1434-hide-actions-in-detail-pages-if-they-re-not-available
Display actions only if ACLs are available
2015-12-07 10:49:07 +01:00
Tim Daubenschütz
9392a71b33 Add comment for bug fix hiding actions from detail pages 2015-12-07 10:48:46 +01:00
Tim Daubenschütz
b0b8af3305 Merge pull request #2 from ascribe/AD-1149-implement-lumenus-the-lumen-mark
Implement marketplace wallets
2015-12-07 10:37:22 +01:00
Brett Sun
41ef51c478 Revert "Add consign error to market white labels"
This reverts commit cb972eb448.
Unfortunately, the edition's `acl_edit` can still be true when
the piece's `acl_edit` is false, so there is no good way on
the frontend right now to tell when to show the error message.

For now we'll assume submissions to marketplaces are all new
and ignore this edge case.
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
b43faf9b45 Fix multiple edition statuses 2015-12-04 16:29:57 +01:00
Brett Sun
0763c45548 Disable form when acl_edit is turned off 2015-12-04 15:35:01 +01:00
Brett Sun
5a6026d0ca Fix ListItemEditionWidget spinner's colour 2015-12-04 14:34:59 +01:00
Brett Sun
9d02877363 Fix customThumbnailPlacholder propType 2015-12-04 13:52:17 +01:00
Brett Sun
904a6ce15a Merge pull request #46 from ascribe/AD-1149-style-23vivi
AD-1149 Style 23vivi
2015-12-04 13:39:09 +01:00
Brett Sun
4b17225783 Fix padding in InputContractAgreementCheckbox 2015-12-04 13:32:29 +01:00
Tim Daubenschütz
3335032609 Finalize InputContractAgreementCheckbox 2015-12-04 12:06:08 +01:00
Tim Daubenschütz
0b79a55175 Destructure correct contractAgreement prop 2015-12-04 10:57:57 +01:00
Tim Daubenschütz
34126c2254 Fix negation of expanded prop of Property 2015-12-04 10:49:41 +01:00
Tim Daubenschütz
5a05a029b7 Merge branch 'AD-1149-additional-details' of github.com:ascribe/onion into AD-1149-additional-details 2015-12-03 21:30:48 +01:00
Tim Daubenschütz
36041d3b51 Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett 2015-12-03 21:30:05 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f96:
- Integrate PropertyCollapsible's functionality to Property
2015-12-03 20:26:53 +01:00
Tim Daubenschütz
cb19c46dac Implement PropertyCollapsible's functionality into Property 2015-12-03 20:09:27 +01:00
Brett Sun
854b642de8 Merge with main AD-1149 branch 2015-12-03 17:48:33 +01:00
Brett Sun
e69dfeb355 Revert "Merge with AD-1443"
Revert https://github.com/ascribe/onion/pull/40, as that needs more
work.
2015-12-03 17:43:15 +01:00