diminator
00154196a4
Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 15:12:01 +01:00
Dimitri De Jonghe
c13ad64e57
Merge pull request #63 from ascribe/fix-spinner-centering
...
Fix spinner being off-center
2015-12-09 15:10:39 +01:00
Brett Sun
7525683aad
Fix spinner being off-center
2015-12-09 14:46:34 +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
de3d3e937e
Throw no 'Client Request Error' when body.success is not available
2015-12-09 11:24:11 +01:00
Tim Daubenschütz
e240443e7a
Add 23vivi to README.md
2015-12-08 17:58:43 +01:00
Tim Daubenschütz
cbf253adec
Merge pull request #58 from ascribe/rename-ascribe-logo-font-to-ascribe-font
...
Move ascribe-logo.* files to ascribe-font.*
2015-12-08 17:24:52 +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
0868d4ce70
Merge pull request #55 from ascribe/fix-spinner-centering
...
Use line-height to center spinner-inner
2015-12-08 17:22:51 +01:00
Tim Daubenschütz
2e51e1e1eb
Merge pull request #62 from ascribe/AD-1485-add-faq-link-to-footer
...
Add FAQ to footer
2015-12-08 17:22: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
Brett Sun
049371cc1b
Move ascribe-logo.* to ascribe-font.*
...
Also add the thin cross icon
2015-12-08 15:45:00 +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
57c85198ed
Use line-height to center spinner-inner
2015-12-08 13:33:41 +01:00
Brett Sun
847b59366c
Merge pull request #54 from ascribe/AD-1481-change-23vivi-name-to-uppercase
...
Change frontend instances of 23vivi to be uppercase
2015-12-08 13:24:31 +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
Tim Daubenschütz
b8c58aa900
Add hotfix: do not unlisten history.js object
2015-12-07 17:41:10 +01:00
Tim Daubenschütz
c6443bb79d
Merge pull request #51 from ascribe/AD-1313-Add-marketplace-whitelabel-changes
...
AD-1313 Add marketplace whitelabel changes
2015-12-07 17:29:48 +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
Brett Sun
e0a258262b
Update uploader styling for 23vivi
2015-12-07 17:23:42 +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
bc61cd2322
Merge pull request #50 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title
...
Check for piece id instead of titles in whitelabels
2015-12-07 17:16:56 +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
c464d737ba
Rename ascribe-logo to ascribe-font
2015-12-07 17:04:32 +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
