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 |
|
diminator
|
51ff0295c0
|
refactor prize app to be compliant with whitelabel settings
|
2015-12-10 14:07:05 +01:00 |
|
Tim Daubenschütz
|
32bc4b0c69
|
Add custom styling for PR
|
2015-12-08 16:43:45 +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
|
943d62dd8c
|
Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark
|
2015-11-20 17:59:26 +01:00 |
|
Tim Daubenschütz
|
8188e5ca2f
|
Merge branch 'master' into AD-1315-implement-submission-flow
|
2015-11-16 09:41:06 +01:00 |
|
Tim Daubenschütz
|
0438f461c2
|
Implement static feedback for submitted pieces
|
2015-11-11 16:27:50 +01:00 |
|
Tim Daubenschütz
|
7721d62319
|
Create boilerplate code for portfolioreview
|
2015-11-06 16:52:08 +01:00 |
|
Tim Daubenschütz
|
b78bc66fe9
|
Fix minor bugs for simple_prize app
|
2015-11-06 15:47:55 +01:00 |
|
Tim Daubenschütz
|
5adc34faeb
|
Move and rename sluice prize app to 'simple_prize'
|
2015-11-06 15:18:36 +01:00 |
|