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 |
|
Cevo
|
63a32d949a
|
transfer added
|
2015-11-19 19:47:33 +01:00 |
|
Tim Daubenschütz
|
14621b5b38
|
Generalize UploadButton styling
|
2015-11-17 11:22:24 +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
|
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 |
|
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 |
|
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
|
543605aae3
|
Move store resets to componentDidMount()
|
2015-11-04 13:56:43 +01:00 |
|
Tim Daubenschütz
|
c6f6bb398d
|
Replace all occurrences of with momentjs
|
2015-11-03 10:57:41 +01:00 |
|
Tim Daubenschütz
|
147c852b02
|
Replace getFullYear() with getUTCFullYear()
|
2015-11-02 10:32:48 +01:00 |
|
Brett Sun
|
906ef7c37e
|
Refactor InputTextAreaToggable's required property to take a bool instead
|
2015-10-28 19:19:14 +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 |
|
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 |
|
Tim Daubenschütz
|
f0d8e32ecf
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
|
2015-10-19 10:30:14 +02:00 |
|
diminator
|
c24021302f
|
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
|
2015-10-14 17:25:53 +02:00 |
|
diminator
|
317d2611ba
|
spinners part2
scrollbar
uploader styles
property blur
|
2015-10-14 16:17:10 +02:00 |
|
vrde
|
84d2dd7701
|
Add document title for prize
|
2015-10-13 17:02:03 +02:00 |
|
vrde
|
7c231a4c5e
|
Restore baseUrl in router
|
2015-10-13 14:19:08 +02:00 |
|
vrde
|
12d3fb289e
|
Rename RedirectProxyHandler to AuthProxyHandler
|
2015-10-12 17:00:53 +02:00 |
|
vrde
|
04abf31354
|
Remove ProxyRoute
|
2015-10-12 16:51:18 +02:00 |
|
diminator
|
aaa1a9a000
|
replaced fonts
replaced spinners WIP
renamed settings-property to property
|
2015-10-12 15:25:21 +02:00 |
|
Tim Daubenschütz
|
69afc6165a
|
Incorporate new RedirectProxyRoute into whitelabel pages
|
2015-10-09 15:19:24 +02:00 |
|
diminator
|
dc8599830b
|
updated glyphs, accordion pieces ok
|
2015-10-09 13:14:29 +02:00 |
|
Tim Daubenschütz
|
fbc9ae1fe7
|
Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
Conflicts:
js/third_party/notifications.js
|
2015-10-06 16:50:51 +02:00 |
|
Tim Daubenschütz
|
000719e14d
|
Move third party actions/stores to separate dispatcher
|
2015-10-06 16:47:59 +02:00 |
|
Tim Daubenschütz
|
8ba6f11dfe
|
Fix AccordionListTable item links and missing location propagation
|
2015-10-01 14:54:56 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|