Tim Daubenschütz
5b79648385
Merge pull request #153 from ascribe/fix-digital-work-file-name
...
Fix digital work file name download
2016-03-03 10:05:13 +01:00
Tim Daubenschütz
627ace63cd
Add demo whitelabel page
2016-02-24 11:16:56 +01:00
Tim Daubenschütz
f2c7f02480
Add component for signing S3 url
2016-02-17 11:38:01 +01:00
Brett Sun
4c821bd744
Merge pull request #35 from ascribe/AD-1360-show-common-upload-errors-to-user
...
Show more detailed upload errors and suggest solutions
2016-02-08 11:36:35 +01:00
Brett Sun
028058a12f
Small things that could only be fixed after merging
2016-02-08 11:03:41 +01:00
Tim Daubenschütz
030a86e883
Merge branch 'master' into AP-7-artcity-consignment-wallet
...
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:05:35 +01:00
Tim Daubenschütz
373d9d13a7
Merge branch 'master' into AP-6-polline-consignment-wallet
...
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:03:06 +01:00
Brett Sun
a4292f09c3
Merge with master
2016-02-05 17:06:16 +01:00
Brett Sun
acd7c0f0a3
Fix PR comments
2016-02-05 15:17:59 +01:00
Tim Daubenschütz
f12630dfad
Add routes and styling for artcity.ascribe.io
2016-02-04 13:44:45 +01:00
Tim Daubenschütz
f6a5734871
Add routes and styling for polline.ascribe.io
2016-02-04 10:54:38 +01:00
Brett Sun
76a413cee1
Merge with master
2016-02-01 10:18:30 +01:00
Tim Daubenschütz
8f7d4ccc2c
Increase file size limit to 50GB
...
- Customer request
2016-01-27 11:32:23 +01:00
Brett Sun
af59531fe7
Move fine uploader validation constants into their own file
2016-01-21 12:24:15 +01:00
Brett Sun
7b9c9eca24
Merge with master
2016-01-19 16:39:19 +01:00
Brett Sun
72db69ee9e
Remove unused PrizeList store and action
2016-01-13 16:17:31 +01:00
Brett Sun
fce578e854
Decorate rackt/history with history of previous locations
...
Could be turned into a createHistory enhancer function
(https://github.com/rackt/history/blob/master/docs/Glossary.md#createhis
toryenhancer), but we’ll see what the guys at rackt/history say about
it…
2016-01-08 11:44:25 +01:00
Brett Sun
4a3a368fc5
Remove unused logo and permissions fields from subdomain constants
2016-01-04 13:09:03 +01:00
Brett Sun
e3c9ebe5f3
Limit thumbnail size to 5mb
2015-12-21 11:53:27 +01:00
Brett Sun
482fa51e9e
Finalize text changes
2015-12-10 18:56:19 +01:00
Brett Sun
d5823f10ec
Use mime types for input's accept property as safari doesn't play nicely with just the extensions
2015-12-10 17:54:33 +01:00
Brett Sun
90c75ca4c5
Change uploader error text
2015-12-09 17:08:47 +01:00
Brett Sun
e7cf9a44a0
Add simple check for determining if user's offline while uploading
2015-12-09 15:57:01 +01:00
Brett Sun
e0b35e0a24
Merge with master
2015-12-08 20:55:13 +01:00
Brett Sun
79780cfb3a
Add FileDragAndDropError
2015-12-08 18:22:11 +01:00
Brett Sun
8f3d8fafa6
Change fronted instances of 23vivi to be uppercase
2015-12-08 12:04: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
Tim Daubenschütz
b0b8af3305
Merge pull request #2 from ascribe/AD-1149-implement-lumenus-the-lumen-mark
...
Implement marketplace wallets
2015-12-07 10:37:22 +01:00
Tim Daubenschütz
123e2a4d13
Add functionality to avoid sending error messages to sentry
2015-12-02 14:31:42 +01:00
Brett Sun
3aab73379a
Merge with master
2015-11-30 11:43:33 +01:00
diminator
1c25f8e776
webhooks in settings without acl
2015-11-27 03:24:37 +01:00
Brett Sun
01e3fd5fcd
Add error queue store
...
Allows errors to be queued for showing to the user, such as in the
uploader’s error states.
2015-11-25 16:30:17 +01:00
Brett Sun
4b91b58adf
Merge branch 'AD-1313-Attach-thumbnail-to-piece-in-register-form' into AD-1360-show-common-upload-errors-to-user
2015-11-25 10:18:40 +01:00
Brett Sun
47f56b5505
Add 23vivi to app costs
2015-11-24 18:17:51 +01:00
Brett Sun
efdc5d32e7
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
2015-11-24 10:42:15 +01:00
Brett Sun
3e28d6f421
Add functionality to match known errors
...
Implemented as part of AD-1360 and AD-1378 as a way to match an error
situation to a known class of errors so that we can modify behaviour or
show pretty text to the user.
2015-11-23 17:12:47 +01:00
Tim Daubenschütz
62d7a5863a
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 16:20:24 +01:00
Tim Daubenschütz
bccfc0906f
Revert super funny-"Important minor fix"
...
We better want this not to go live
This reverts commit b77fefb55c
2015-11-20 16:17:08 +01:00
Tim Daubenschütz
e4479dc95b
qMerge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 14:00:36 +01:00
Tim Daubenschütz
0946ddc0b3
Minor fix
2015-11-20 14:00:10 +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
Tim Daubenschütz
3a234e42ec
Merge branch 'master' of github.com:ascribe/onion
2015-11-20 10:21:35 +01:00
Tim Daubenschütz
b77fefb55c
Important minor fix
2015-11-20 10:21:21 +01:00
Cevo
63a32d949a
transfer added
2015-11-19 19:47:33 +01:00
Tim Daubenschütz
399f670bed
Add variety of supported file formats & fix bug when parsing mime type
2015-11-18 17:55:27 +01:00
Tim Daubenschütz
971d42b36d
Add file-format-specific call to action for thumbnail generation
2015-11-17 15:46:46 +01:00
Tim Daubenschütz
ed3624198a
Merge branch 'master' into AD-1309-change-share-to-email
...
Conflicts:
js/components/ascribe_buttons/acls/acl_button.js
2015-11-16 16:55:33 +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
339421a4b7
Merge branch 'master' into AD-56-add-social-share-functionality
...
Conflicts:
js/components/ascribe_detail/media_container.js
js/components/ascribe_media/media_player.js
2015-11-16 15:54:49 +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
