ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-31 17:17:48 +01:00
Code Issues Releases Wiki Activity
2,050 Commits 115 Branches 0 Tags 13 MiB
aba0747fe3
Commit Graph

2050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Daubenschütz
bc61cd2322 Merge pull request #50 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title 
Check for piece id instead of titles in whitelabels
 2015-12-07 17:16:56 +01:00
Tim Daubenschütz
3681260054 Return empty string if file without extension is submitted 2015-12-07 17:14:43 +01:00
Tim Daubenschütz
c464d737ba Rename ascribe-logo to ascribe-font 2015-12-07 17:04:32 +01:00
Tim Daubenschütz
56d8726a0b Minor changes for integrating PR Feedback 2015-12-07 17:02:53 +01:00
Tim Daubenschütz
343d6bfea2 Fix a bug that locked submit button in disabled mode 2015-12-07 16:58:26 +01:00
Tim Daubenschütz
9c9c99c714 Show filename when uploading 2015-12-07 16:34:10 +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
ddfdaa30e7 Merge fixes 2015-12-07 14:01:17 +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
2b6b78310c Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio 
AD-1177 display 404 on pieces and editio
 2015-12-07 11:49:39 +01:00
Tim Daubenschütz
3ce63c33bf Finalize ReactError component 2015-12-07 11:48:28 +01:00
Tim Daubenschütz
0a67766aba Include PR Feedback: Check if Error.captureStackTrace is available 2015-12-07 11:32:04 +01:00
diminator
f76ebffbe2 fix: acl_wallet_submit on 23vivi register piece 2015-12-07 11:17:42 +01:00
Tim Daubenschütz
45919f93a6 Merge pull request #32 from ascribe/AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null 
Ad 1342 public piece note doesnt render correctly def data null
 2015-12-07 11:00:39 +01:00
Tim Daubenschütz
4f39103baf Use Oops 2015-12-07 10:59:07 +01:00
Tim Daubenschütz
3374862edf Make monkeyPatched key specific to component's displayName 2015-12-07 10:57:49 +01:00
Brett Sun
d2aba04bea Change show condition on public note to be more stylistically similar 2015-12-07 10:52:00 +01:00
Tim Daubenschütz
2130b74a96 Merge pull request #42 from ascribe/AD-1434-hide-actions-in-detail-pages-if-they-re-not-available 
Display actions only if ACLs are available
 2015-12-07 10:49:07 +01:00
Tim Daubenschütz
9392a71b33 Add comment for bug fix hiding actions from detail pages 2015-12-07 10:48:46 +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
3996abcb5d Merge pull request #44 from ascribe/AD-1453-add-functionality-to-avoid-sending-error-messages-to-sentry 
Add functionality to avoid sending error messages to sentry
 2015-12-07 10:25:52 +01:00
Brett Sun
c3c493dc48 Merge pull request #49 from ascribe/AD-1149-final-changes 
AD-1149 Final Changes
 2015-12-07 10:25:25 +01:00
Brett Sun
41ef51c478 Revert "Add consign error to market white labels" 
This reverts commit cb972eb448.
Unfortunately, the edition's `acl_edit` can still be true when
the piece's `acl_edit` is false, so there is no good way on
the frontend right now to tell when to show the error message.

For now we'll assume submissions to marketplaces are all new
and ignore this edge case.
 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
b43faf9b45 Fix multiple edition statuses 2015-12-04 16:29:57 +01:00
Brett Sun
0763c45548 Disable form when acl_edit is turned off 2015-12-04 15:35:01 +01:00
Brett Sun
5a6026d0ca Fix ListItemEditionWidget spinner's colour 2015-12-04 14:34:59 +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
Brett Sun
c9949f0cc0 Merge pull request #47 from ascribe/AD-1149-additional-details 
AD-1149 Contract agreement in consign forms
 2015-12-04 13:38:18 +01:00
Brett Sun
4b17225783 Fix padding in InputContractAgreementCheckbox 2015-12-04 13:32:29 +01:00
Tim Daubenschütz
510318c319 Fix styling issues related to Panel in Property 2015-12-04 12:28:11 +01:00
Tim Daubenschütz
3335032609 Finalize InputContractAgreementCheckbox 2015-12-04 12:06:08 +01:00
Tim Daubenschütz
0b79a55175 Destructure correct contractAgreement prop 2015-12-04 10:57:57 +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
36041d3b51 Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett 2015-12-03 21:30:05 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f96: 
- Integrate PropertyCollapsible's functionality to Property
 2015-12-03 20:26:53 +01:00
Tim Daubenschütz
cb19c46dac Implement PropertyCollapsible's functionality into Property 2015-12-03 20:09:27 +01:00
Brett Sun
854b642de8 Merge with main AD-1149 branch 2015-12-03 17:48:33 +01:00
Brett Sun
e69dfeb355 Revert "Merge with AD-1443" 
Revert https://github.com/ascribe/onion/pull/40, as that needs more
work.
 2015-12-03 17:43:15 +01:00
Brett Sun
f5a527b251 Fix references to form due to nested property elements 2015-12-03 17:19:17 +01:00
Brett Sun
9c64cf2b80 Add hot fix from AD-1313 for using refs in properties 
https://github.com/ascribe/onion/blob/AD-1313-Attach-thumbnail-to-piece-
in-register-form/js/components/ascribe_forms/form.js
 2015-12-03 17:17:52 +01:00
Brett Sun
328d60b279 Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty 2015-12-03 15:22:37 +01:00
Brett Sun
3c516c1598 Refactor contract agreement to be a self contained component that can be used in forms 2015-12-03 15:22:17 +01:00
Brett Sun
e442e6bcec Make email input be react controlled in loan and consign forms 2015-12-03 15:21:14 +01:00
Brett Sun
e1477be393 Fix typo in PropertyCollapsible declaration 2015-12-03 13:34:24 +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