1
0
mirror of https://github.com/ascribe/onion.git synced 2025-02-11 16:11:34 +01:00
Commit Graph

308 Commits

Author SHA1 Message Date
Cevo
b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
Tim Daubenschütz
5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz
62e85c66ac Rename 'Send loan request' to 'send contract' for ikonoTv 2015-09-28 11:51:02 +02:00
Tim Daubenschütz
afef5db150 Add proper button to create editions form 2015-09-28 10:19:12 +02:00
diminator
5ddf89e020 forward to collection after contract sent 2015-09-25 15:39:36 +02:00
Tim Daubenschütz
4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-23 14:22:09 +02:00
Tim Daubenschütz
4acbc2c923 fix InputTextareaToggable 2015-09-23 14:12:33 +02:00
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz
33b8e51aee Fix react warning for select inputs 2015-09-22 14:13:04 +02:00
Tim Daubenschütz
878a716262 Remove 'learn more' from contract form 2015-09-22 13:20:55 +02:00
Tim Daubenschütz
31ffc4262a change text in signup form 2015-09-22 11:41:10 +02:00
Tim Daubenschütz
6102ed3bb4 update react textarea autosize 2015-09-21 16:10:25 +02:00
Tim Daubenschütz
c756024702 Add whitelabel tailored extra_data forms to piece detail 2015-09-21 15:08:24 +02:00
Tim Daubenschütz
652df66cb3 Fix some issues with smelly code 2015-09-21 14:22:52 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
Tim Daubenschütz
3cbcfc17a3 Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-21 10:57:19 +02:00
Tim Daubenschütz
0819724a10 probably fix dispatch.dispatch error + showing wrong piece data bug 2015-09-21 10:57:10 +02:00
diminator
ec0208358d added appendix 2015-09-21 10:54:13 +02:00
diminator
2486158c12 .required => .isRequired 2015-09-21 10:47:24 +02:00
diminator
9bfd50e3bc Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
Conflicts:
	js/components/signup_container.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
2015-09-21 10:21:44 +02:00
vrde
004aa16b3f Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-18 15:43:30 +02:00
Tim Daubenschütz
e05249eacb WIP fix wrong input fields bug 2015-09-18 14:50:08 +02:00
Tim Daubenschütz
2cbf7d0095 Implement PR Feedback 2015-09-18 14:12:50 +02:00
diminator
2bd148407b Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields 2015-09-17 14:22:19 +02:00
diminator
ff163df61e PR update 2015-09-17 14:20:46 +02:00
Tim Daubenschütz
780ab9f7f1 Cleanup window.setTimeout 2015-09-17 13:28:59 +02:00
diminator
63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
Cevo
cf39b1e708 min year changed to 1 2015-09-17 11:17:47 +02:00
diminator
5c2ec3ffb0 bug fix signup query
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
2015-09-16 23:27:38 +02:00
diminator
a85447e94c bug fix user token on signup/login 2015-09-16 19:00:59 +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
f0936b9074 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 17:19:50 +02:00
Tim Daubenschütz
2656bdac14 correct query parameters for contract list request 2015-09-15 17:18:38 +02:00
Tim Daubenschütz
497a330e1a Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 13:56:31 +02:00
diminator
4ae137ee9e Merged in AD-924-apply-contractagreements-to-loan- (pull request #57)
Ad 924 apply contractagreements to loan
2015-09-15 13:43:21 +02:00
diminator
06f5b61cad reset agreements on mount of loan_form 2015-09-15 13:37:18 +02:00
Tim Daubenschütz
ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
diminator
71f94768d9 fix PR comments 2015-09-15 13:22:52 +02:00
Tim Daubenschütz
c5ef3cacd5 add ContractSettingsUpdateButton boilerplate code 2015-09-15 11:50:23 +02:00
Tim Daubenschütz
280f3bc73a Add input filter for specific file extensions to react fineuploader 2015-09-15 10:15:56 +02:00
diminator
0ce298879b fixed tests
refactored contractagreement actions
2015-09-14 17:53:50 +02:00
Tim Daubenschütz
209d141939 extend fileClassToUpload functionality and implement it in contract settings 2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff add fileclassToUpload to react fineuploader 2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec make contract creation implicit 2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544 rename fineuploader's submitKey method to submitFile 2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
Conflicts:
	js/components/ascribe_forms/property.js
2015-09-14 14:23:36 +02:00
diminator
7fd5516b79 contract, contractagreement migration
contractagreement added to loanpiece
2015-09-14 14:16:53 +02:00