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
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
Brett Sun
f5a527b251
Fix references to form due to nested property elements
2015-12-03 17:19:17 +01:00
Brett Sun
9c64cf2b80
Add hot fix from AD-1313 for using refs in properties
...
https://github.com/ascribe/onion/blob/AD-1313-Attach-thumbnail-to-piece-
in-register-form/js/components/ascribe_forms/form.js
2015-12-03 17:17:52 +01:00
Brett Sun
328d60b279
Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty
2015-12-03 15:22:37 +01:00
Brett Sun
3c516c1598
Refactor contract agreement to be a self contained component that can be used in forms
2015-12-03 15:22:17 +01:00
Brett Sun
e442e6bcec
Make email input be react controlled in loan and consign forms
2015-12-03 15:21:14 +01:00
Brett Sun
e1477be393
Fix typo in PropertyCollapsible declaration
2015-12-03 13:34:24 +01:00
Brett Sun
bde1e454ed
Change loan form's startdate and enddate props to be camel case
2015-12-03 13:34:00 +01:00
Brett Sun
3f3ba50aa5
Merge with main AD-1149 branch
2015-12-03 12:51:47 +01:00
Brett Sun
78b8887fbf
Fix Cyland landing page
...
Fix font family to be Gibson, center vertically.
2015-12-03 12:44:12 +01:00
Brett Sun
43916625bd
Remove header from white labels that have landing pages
2015-12-03 12:41:59 +01:00
Brett Sun
cec652551e
Add 23vivi landing page
2015-12-03 12:41:27 +01:00
Tim Daubenschütz
911860ccb5
Finalize cancel and delete functionality for UploadButton
2015-12-03 10:42:55 +01:00
Brett Sun
55bdd4e03f
Only show the label or errors part of a Property if they exist
...
Fix weird spacing for properties that don’t have labels (ie. checkboxes
for terms of service, etc)
2015-12-03 00:49:26 +01:00
Brett Sun
61908a82f6
Fix prop type for MarketAdditionalDataForm's submitLabel
2015-12-03 00:48:21 +01:00
diminator
dafdf97678
Merge branch 'AD-1149-implement-lumenus-the-lumen-mark' of github.com:ascribe/onion into AD-1149-implement-lumenus-the-lumen-mark
2015-12-02 21:44:12 +01:00
diminator
565bf308ae
tested and fixed ikonotv
2015-12-02 21:42:35 +01:00
Brett Sun
3be033cdd5
Add thumbnail placeholder for 23vivi
2015-12-02 19:31:50 +01:00
diminator
743c11df5b
fixed cyland/ikono serializers
2015-12-02 18:56:48 +01:00
Brett Sun
594853535b
Fix trailing comma from previous PR merge
...
Turns out this is actually illegal in ES6 but on some version of babel,
they don’t care.
Might be an ES7 thing though:
http://www.2ality.com/2015/11/trailing-comma-parameters.html
2015-12-02 18:28:30 +01:00
Brett Sun
4664a48898
Change additional form's button text when not in registration flow
2015-12-02 18:18:20 +01:00
Tim Daubenschütz
8fcb7fcb01
Fix render bug for personal piece note
2015-12-02 16:51:56 +01:00
Tim Daubenschütz
81f28a02f9
Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null
2015-12-02 16:39:18 +01:00
Brett Sun
2381bd22ac
Change nested destructuring formatting
2015-12-02 16:05:21 +01:00
Tim Daubenschütz
d01acea9ce
Nicer formatting for long parametrized function
2015-12-02 14:34:31 +01:00
Tim Daubenschütz
123e2a4d13
Add functionality to avoid sending error messages to sentry
2015-12-02 14:31:42 +01:00
Brett Sun
07834414c7
Set default name for marketplace wallets to be 'Market' until the white label name loads
2015-12-02 14:26:15 +01:00
Brett Sun
916ec7aace
Rearrange handleDrop() to flow more naturally
2015-12-02 13:52:17 +01:00
Tim Daubenschütz
fe24a5e15a
Remove all occurrences of inactivity mgmt of ReactS3Fineuploader
2015-12-02 12:37:21 +01:00
Tim Daubenschütz
8b3060d613
Fix simple comments in pr
2015-12-02 12:25:11 +01:00
Tim Daubenschütz
85340a9126
Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay
2015-12-02 12:23:38 +01:00
Tim Daubenschütz
4fe10bb887
Cosmetic changes for EditionContainer & PieceContainer
2015-11-30 18:26:27 +01:00
Tim Daubenschütz
0b2bc1c57b
Introduce ReactError mixin for handling errors in React components
2015-11-30 18:23:03 +01:00
Tim Daubenschütz
68f41f7550
Implement boilerplate logic for ReactError
2015-11-30 15:01:07 +01:00
Tim Daubenschütz
5a6c827f0b
Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/ascribe_detail/piece_container.js
2015-11-30 15:00:39 +01:00
Tim Daubenschütz
2b6c9777e9
Display actions only if ACLs are available
2015-11-30 13:20:05 +01:00
Tim Daubenschütz
6500af121a
Merge pull request #36 from ascribe/AD-706-close-expandable-navigation-after-click
...
Bug fix for collapsing nav
2015-11-30 11:59:47 +01:00
Brett Sun
b4ddec3427
Merge with AD-1443
2015-11-30 11:46:57 +01:00
Brett Sun
3aab73379a
Merge with master
2015-11-30 11:43:33 +01:00
Brett Sun
3d017392c1
Only use previous filterBy on refreshing edition lists if no filterBy argument was given
...
Also fix the behaviour of refresh using the list’s current length
rather than the previous page size.
2015-11-30 11:32:48 +01:00
Brett Sun
ea52c54e3a
Fix check for determining if a piece's edition list is open
2015-11-30 11:27:15 +01:00
Brett Sun
539c34db48
Fix typo for getDefaultProps() in consign form
2015-11-30 11:19:59 +01:00
Brett Sun
0c02c033e5
Fix consign form when labels aren't give as props
2015-11-27 23:53:54 +01:00
Dimitri De Jonghe
a21e450a93
Merge pull request #39 from ascribe/AD-1403-api-webhooks
...
webhooks in settings page
2015-11-27 18:04:41 +01:00
diminator
d03d1355ff
copy for webhooks
2015-11-27 18:02:25 +01:00
Brett Sun
5137fa01a9
Add note for navBar state hack
2015-11-27 14:13:30 +01:00