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
|
fbb35915eb
|
Update market routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:57:48 +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
|
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
|
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
|
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
|
08025cc427
|
Remove unused showAddWork property from Header
|
2015-12-14 18:58:05 +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
|
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 |
|
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
|
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
|
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
|
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 |
|
Brett Sun
|
bde1e454ed
|
Change loan form's startdate and enddate props to be camel case
|
2015-12-03 13:34:00 +01:00 |
|
Tim Daubenschütz
|
7146f00c05
|
Refactor webhooks: add source, clear state on create hide create on no items left
|
2015-11-27 13:36:42 +01:00 |
|
Tim Daubenschütz
|
943d62dd8c
|
Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark
|
2015-11-20 17:59:26 +01:00 |
|
Tim Daubenschütz
|
f4f89bba43
|
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
|
2015-11-20 13:53:03 +01:00 |
|