ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
1,966 Commits 115 Branches 0 Tags 13 MiB
5a6026d0ca
Commit Graph

409 Commits

Author SHA1 Message Date
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
Cevo
63a32d949a transfer added 2015-11-19 19:47: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
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