ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 13:41:57 +02:00
Code Issues Releases Wiki Activity
1,412 Commits 115 Branches 0 Tags 13 MiB
cb452ce7bf
Commit Graph

1126 Commits

Author SHA1 Message Date
Tim Daubenschütz
cb452ce7bf PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex 2015-09-25 15:22:16 +02:00
Tim Daubenschütz
9080c84fa9 Implement word wrap for ContractSettings 2015-09-25 11:20:12 +02:00
Tim Daubenschütz
a6f09c8f35 add acl for update button in ContractSettings 2015-09-23 16:09:12 +02:00
Tim Daubenschütz
74e7c9a3d9 Integrate new ACLOptions into settings 2015-09-23 15:41:12 +02:00
Tim Daubenschütz
2a4bc2af89 separate contract settings from account settings 2015-09-23 15:16:46 +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
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
24b7031c72 Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields 2015-09-22 17:23:37 +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
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
Tim Daubenschütz
52903c6982 Fix labels for buttons 2015-09-22 16:49:01 +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
bd5aa266b1 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-22 13:38:31 +02:00
Tim Daubenschütz
4bbc4afd61 Increase robustness by excluding meta data for pieces that have been loaned before actual launch 2015-09-22 13:37:31 +02:00
Tim Daubenschütz
878a716262 Remove 'learn more' from contract form 2015-09-22 13:20:55 +02:00
diminator
54a1049b48 Merged in AD-1029-add-filter-for-submitted-accepte (pull request #71) 
filter for submitted and accepted on ikonotv
 2015-09-22 13:14:28 +02:00
diminator
5f98f65842 filter in frontend 2015-09-22 12:20:14 +02:00
Tim Daubenschütz
a8c436c40b Change detail text in loan process 2015-09-22 11:56:30 +02:00
Tim Daubenschütz
aaa27550af Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-22 11:43:53 +02:00
Tim Daubenschütz
31ffc4262a change text in signup form 2015-09-22 11:41:10 +02:00
Tim Daubenschütz
a0ff5af62b Make style changes 2015-09-22 11:33:59 +02:00
Tim Daubenschütz
b0b44718da Changes to landing page text according to Elisabeth 2015-09-22 10:29:23 +02:00
diminator
b4c7b864fd check if piece exists in props in wallet details 2015-09-22 09:20:10 +02:00
diminator
904793269b refactored detail page for wallets 2015-09-21 18:04:15 +02:00
diminator
c837890895 Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields 2015-09-21 16:51:28 +02:00
diminator
a4fe0417c3 refactored and adapted for cyland 2015-09-21 16:47:29 +02:00
Tim Daubenschütz
bd99adf4c9 add componentWillReceiveProps in ikono piece detail again 2015-09-21 16:25:28 +02:00
vrde
865c21557c Add style for buttons 2015-09-21 16:23:18 +02:00
diminator
fdbae0316f filter for submitted and accepted on ikonotv 
MIGRATE AND
./manage.py loaddata whitelabel/fixtures/settings.json
 2015-09-21 16:14:39 +02:00
Tim Daubenschütz
6102ed3bb4 update react textarea autosize 2015-09-21 16:10:25 +02:00
Tim Daubenschütz
04e331f4e5 hide additional files when not defined and already loaned to whitelabel customer 2015-09-21 15:57:27 +02:00
Tim Daubenschütz
6c2bb041f9 finalize whitelabel custom fields 2015-09-21 15:46:24 +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
8a6674509c Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-21 12:05:53 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
diminator
92f543490e buttonlink style 2015-09-21 11:26:36 +02:00
diminator
a8976ca54a Merge remote-tracking branch 'remotes/origin/AD-996-add-action-buttons-to-piece-detai' into AD-943-add-custom-additional-fields 2015-09-21 11:08:05 +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
9d67d046d0 fix currentUser bug 2015-09-21 10:32:35 +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
Tim Daubenschütz
7b7250db24 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-18 16:21:03 +02:00
Tim Daubenschütz
afef1214f0 contract expandedDefault to false 2015-09-18 16:04:48 +02:00
Tim Daubenschütz
7482c3f448 add user endpoint to cyland 2015-09-18 15:51:15 +02:00