Brett Sun
15cf6498a8
Remove unused Cyland hero component
2016-02-05 11:54:02 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
2ad2ea242d
Changes for PR comments
2016-01-18 17:31:56 +01:00
Brett Sun
5b2178eb7e
Use height for landing page logos
...
Using height means the browser can allocate space for the image before
it loads, so there’s no flash of movement
2016-01-12 15:06:43 +01:00
Brett Sun
40041197d6
Update components for loading WhitelabelStore from top level app
2016-01-11 19:22:25 +01:00
Brett Sun
8009174787
Change AccordionListItems and parents for loading UserStore from top level app
2016-01-11 19:06:50 +01:00
Brett Sun
1c4ca0d152
Change RegisterPieceForm and parents for loading UserStore from top level app
2016-01-11 18:16:46 +01:00
Brett Sun
8531b77633
Merge with master
2016-01-11 17:52:32 +01:00
Brett Sun
d4bb00168c
Change AclButtonList and parents for loading UserStore from top level app
2016-01-11 17:41:31 +01:00
Brett Sun
3e66b78d4c
Update Cyland routes for loading user and whitelabel settings in top level app
2016-01-11 16:27:03 +01:00
Brett Sun
b971d516cc
Fix PR feedback for Cyland loan button
2015-12-16 15:33:00 +01:00
Brett Sun
e3c4e54386
Reverse order of Cyland loan form buttons
...
Maintains consistency with other buttons on the web app.
2015-12-16 14:24:03 +01:00
Brett Sun
764b9dbf12
Remove leftover function from previous functionality that was removed
2015-12-16 12:44:50 +01:00
Brett Sun
7fbe8a311b
Use col-xs instead of col-sm to handle mobile screens on white label landing pages
2015-12-16 12:43:43 +01:00
Brett Sun
1ea89313ff
Add custom buttons to loan form for Cyland registration
2015-12-16 12:43:03 +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
904a6ce15a
Merge pull request #46 from ascribe/AD-1149-style-23vivi
...
AD-1149 Style 23vivi
2015-12-04 13:39:09 +01:00
Tim Daubenschütz
34126c2254
Fix negation of expanded prop of Property
2015-12-04 10:49:41 +01:00
Tim Daubenschütz
8ec0634d2e
Cherry-pick from 1ac2fe7f9694254c75f0cff46222d895d97dd791:
...
- Integrate PropertyCollapsible's functionality to Property
2015-12-03 20:26:53 +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
78b8887fbf
Fix Cyland landing page
...
Fix font family to be Gibson, center vertically.
2015-12-03 12:44:12 +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
943d62dd8c
Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark
2015-11-20 17:59:26 +01:00
Tim Daubenschütz
1ac2fe7f96
Remove all occurences of 'hidden' prop usage for Property
2015-11-17 15:52:40 +01:00
Tim Daubenschütz
a8ccf13f91
Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady
2015-11-17 12:03:22 +01:00
Tim Daubenschütz
ac07107210
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
...
Conflicts:
js/constants/application_constants.js
js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz
da73d40fd6
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
...
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
b35d6a1013
Merge pull request #22 from ascribe/AD-1298-for-cyland-add-extra-fields
...
Add additional fields to step two of cyland's loan process
2015-11-16 14:11:34 +01:00
Tim Daubenschütz
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
c852eaf143
Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014
...
Replace Javascript's Date object with momentjs
2015-11-13 09:58:12 +01:00
Tim Daubenschütz
19bdf59f46
Include feedback from PR for destructuring props
2015-11-13 09:57:22 +01:00
Tim Daubenschütz
8892ac4225
Add additional fields to step two of cyland's loan process
2015-11-05 11:56:09 +01:00
Brett Sun
3fb4ae55bf
Merge with AD-1290
2015-11-04 14:04:16 +01:00
Brett Sun
543605aae3
Move store resets to componentDidMount()
2015-11-04 13:56:43 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Tim Daubenschütz
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Brett Sun
8540e3de36
Bring over missed changes for cyland for changes to form utils
2015-11-02 15:36:18 +01:00
Brett Sun
a513af984d
Update cyland for FineUploader changes
2015-11-02 10:41:59 +01:00
Tim Daubenschütz
147c852b02
Replace getFullYear() with getUTCFullYear()
2015-11-02 10:32:48 +01:00
Brett Sun
82b49fc653
Add additional required properties for Lumenus
...
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
2015-10-27 17:54:35 +01:00
Tim Daubenschütz
42733740db
Fix correct year extraction from date-string in
...
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
2015-10-26 16:07:31 +01:00
Brett Sun
3dedc93d2e
Force consignee to be submissions@lumenus.co
...
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
2015-10-23 14:19:44 +02:00
Tim Daubenschütz
b77beb0b1e
Replace last occurences of ascribe-spool-chunked
2015-10-22 17:17:38 +02:00
Tim Daubenschütz
7f97ce9828
Handle deletion method for WalletPieceContainer
2015-10-21 23:45:53 +02:00
Tim Daubenschütz
fad6caca63
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
2015-10-21 09:47:14 +02:00
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +02:00