ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,556 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

89 Commits

Author SHA1 Message Date
tim 76daa7edc2 Add Liquid Gallery Whitelabel Page 2016-04-06 16:22:03 +02:00
Tim Daubenschütz e0401de1a3 Add async tiff thumbnail encoding support 
- Fixes #171
 2016-03-09 16:54:11 +01:00
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
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
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
Brett Sun af59531fe7 Move fine uploader validation constants into their own file 2016-01-21 12:24:15 +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 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 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
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.

Conflicts:
	js/constants/application_constants.js
 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 b77fefb55c Important minor fix 2015-11-20 10:21:21 +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 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
Brett Sun 00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +01:00
Brett Sun 8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Brett Sun d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
Brett Sun f92fa972bf Merge with AD-1255 2015-11-06 15:26:37 +01:00
Tim Daubenschütz f5a5e045a6 Finalize boilerplate for portfolioreview subdomain 2015-11-06 15:18:46 +01:00
Brett Sun 56eff0d9ed Improve DRYness of acl buttons 
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
 2015-11-06 15:10:29 +01:00
Brett Sun ac1b43d24b Set the consignee email by using the server's white label settings 
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.

Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
 2015-10-26 19:17:06 +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
Brett Sun 7116133337 AD-1194 Create front-end host configs 
Default route components to be replaced with Lumenus specific ones.
 2015-10-21 14:10:21 +02:00
TimDaubenschuetz 9dec5eab1d Merged in AD-744-search-filter-not-working-i-type- (pull request #97) 
Ad 744 search filter not working i type
 2015-10-15 15:16:33 +02:00
Tim Daubenschütz 002bab8e79 Increase additional data file size 2015-10-13 10:13:53 +02:00
Tim Daubenschütz 6d36be5311 Add documentation for SearchBar and put threshold into AppConstants 2015-10-12 17:10:04 +02:00
Tim Daubenschütz 90d6ec20f6 Revert "Revert "acls on 3 levels"" 
This reverts commit c02d1ea3ac.
 2015-09-22 17:38:25 +02:00
Tim Daubenschütz c02d1ea3ac Revert "acls on 3 levels" 
This reverts commit f1bc400faf.
 2015-09-22 17:29:07 +02:00
diminator f1bc400faf acls on 3 levels 
whitelabel
user
piece

the higher on the list, the more power (whitelabel overrides user and piece)
 2015-09-22 17:23:19 +02:00
diminator b24d4608dd Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-16 15:59:07 +02:00
Tim Daubenschütz 7c376b7229 PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants 2015-09-16 15:14:08 +02:00
diminator d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
Tim Daubenschütz e087e9f332 PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js 2015-09-14 11:36:24 +02:00