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
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
diminator
f76ebffbe2
fix: acl_wallet_submit on 23vivi register piece
2015-12-07 11:17:42 +01:00
Brett Sun
41ef51c478
Revert "Add consign error to market white labels"
...
This reverts commit cb972eb448
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
0763c45548
Disable form when acl_edit is turned off
2015-12-04 15:35:01 +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
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
8ec0634d2e
Cherry-pick from 1ac2fe7f96:
...
- Integrate PropertyCollapsible's functionality to Property
2015-12-03 20:26:53 +01:00
Brett Sun
854b642de8
Merge with main AD-1149 branch
2015-12-03 17:48:33 +01:00
Brett Sun
328d60b279
Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty
2015-12-03 15:22:37 +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
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
Brett Sun
4664a48898
Change additional form's button text when not in registration flow
2015-12-02 18:18:20 +01:00
Brett Sun
2381bd22ac
Change nested destructuring formatting
2015-12-02 16:05:21 +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
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
Brett Sun
3aab73379a
Merge with master
2015-11-30 11:43:33 +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
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
88d1edd45c
Add pageExitWarning for SlidesContainer
2015-11-25 15:01:23 +01:00
Brett Sun
c270977eb9
Fix default filter on piece list
2015-11-24 19:26:45 +01:00
Brett Sun
e228a4bf15
Dynamically get marketplace name for submit button
2015-11-24 18:18:49 +01:00
Brett Sun
2e03ab584a
Fix api endpoints
2015-11-24 18:17:38 +01:00
Brett Sun
a72fea5db4
Add 23vivi routes
2015-11-24 12:08:37 +01:00
Brett Sun
ee61369d46
Update market api endpoints
2015-11-24 12:04:18 +01:00
Brett Sun
f7b55e56a9
Split Lumenus into a generic market wallet for 23vivi
2015-11-24 12:04:08 +01:00
Brett Sun
efdc5d32e7
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
2015-11-24 10:42:15 +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
Cevo
63a32d949a
transfer added
2015-11-19 19:47:33 +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
14621b5b38
Generalize UploadButton styling
2015-11-17 11:22:24 +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
8188e5ca2f
Merge branch 'master' into AD-1315-implement-submission-flow
2015-11-16 09:41:06 +01:00
Tim Daubenschütz
1c172fd887
Last minute editions for usability
2015-11-16 09:39:45 +01:00
Tim Daubenschütz
633ebc8fb9
Last minute edits
2015-11-13 17:07:21 +01:00
Tim Daubenschütz
5d7f6bf6ed
Fix redirect on email submission
2015-11-13 16:51:31 +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
f5c76af6cb
Complete list of supported image file formats on the web
2015-11-12 14:52:03 +01:00
Tim Daubenschütz
da09bd8649
Add link to ToS to submission form
2015-11-12 14:48:57 +01:00
Tim Daubenschütz
45d5821abb
Refactor UploadButton to resemble HTML5 file chooser input
2015-11-12 14:18:08 +01:00
Tim Daubenschütz
d1b931715d
Add spinner to submission for and make submittable on default with providing error messages
2015-11-12 13:21:10 +01:00
Tim Daubenschütz
1a67cd66f5
Add labeling functionality to UploadButton
2015-11-12 13:08:23 +01:00
Tim Daubenschütz
3be275aefd
Add artist contact information
2015-11-12 11:51:33 +01:00
Tim Daubenschütz
5b594e9d82
left-align uploader buttons
2015-11-12 11:27:55 +01:00
Tim Daubenschütz
e6d839f6a0
Add proper validation for multiple uploaders in submission form
2015-11-12 10:46:08 +01:00
Tim Daubenschütz
62f19467b7
Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine
2015-11-11 18:17:32 +01:00
Tim Daubenschütz
0438f461c2
Implement static feedback for submitted pieces
2015-11-11 16:27:50 +01:00
Brett Sun
e85747144a
Add Lumenus landing page
2015-11-10 18:49:08 +01:00
Brett Sun
84e8e4612f
Autofocus message field in consignment form and use custom labels
...
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
2015-11-10 18:24:46 +01:00
Tim Daubenschütz
ea321a4a77
Finalize submission flow with validation and thumbnail creation
2015-11-10 17:35:57 +01:00
Tim Daubenschütz
be7fa0c6eb
Add conditional redirect after successful registration
2015-11-10 10:15:38 +01:00
Tim Daubenschütz
9ae6b10add
Finalizing basic submission flow with lazy evaluated form
2015-11-09 17:52:09 +01:00
Tim Daubenschütz
3e22ad1d9d
Finalize layouting submission form
2015-11-09 10:35:23 +01:00
Tim Daubenschütz
7721d62319
Create boilerplate code for portfolioreview
2015-11-06 16:52:08 +01:00
Brett Sun
b100fdd80a
Change default collection filter for lumens admin
2015-11-06 16:13:47 +01:00
Tim Daubenschütz
b78bc66fe9
Fix minor bugs for simple_prize app
2015-11-06 15:47:55 +01:00
Tim Daubenschütz
f5a5e045a6
Finalize boilerplate for portfolioreview subdomain
2015-11-06 15:18:46 +01:00
Tim Daubenschütz
5adc34faeb
Move and rename sluice prize app to 'simple_prize'
2015-11-06 15:18:36 +01:00
Brett Sun
318a0bf4b2
Filter the collection to only show the consignable items by default
2015-11-06 14:10:54 +01:00
Brett Sun
799ccb9b8d
Show unconsign button
2015-11-06 14:01:26 +01:00
Brett Sun
fb62d2d2e0
Check for completion of additional data on front end
...
In the end, it made more sense to check if all the additional details
have been filled in on the front end than receiving an acl or flag from
the backend.
2015-11-06 14:00:58 +01:00
Brett Sun
04e453b28c
Fix lumenus edition endpoint
2015-11-05 16:05:20 +01:00
Brett Sun
6223248ea0
Fix lumenus whitelabel api endpoints
2015-11-05 13:51:40 +01:00
Brett Sun
4ca8ca8feb
Show AdditionalDetailsModal from SubmitButton when details need to be filled in
2015-11-05 11:58:32 +01:00
Brett Sun
adf0d411d6
Fetch piece data in AdditionalDetailForm
...
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
2015-11-05 11:56:17 +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
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +01:00
Brett Sun
3929712e9d
Prune unnecessary divs from some components
2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb
Change lumens buttons for AD-1264 changes
2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Tim Daubenschütz
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Brett Sun
3a8f91e29e
Change required prop for AD1251 changes
2015-11-03 10:49:06 +01:00
Brett Sun
68c1dd9407
Merge with AD1251
2015-11-03 10:48:28 +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
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +01:00
