ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity
1,410 Commits 115 Branches 0 Tags 13 MiB
a6f09c8f35
Commit Graph

1410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TimDaubenschuetz
93e61cfff5 Merged in AD-943-add-custom-additional-fields (pull request #60) 
Ad 943 add custom additional fields
 2015-09-23 14:16:16 +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
TimDaubenschuetz
6e09d5bc16 Merged in AD-1049-fix-form-borders (pull request #78) 
Fix form borders
 2015-09-22 17:21:12 +02:00
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
vrde
172b5b7c5b Fix form borders 2015-09-22 17:11:38 +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
TimDaubenschuetz
dfc75824de Merged in AD-1045-revamp-flashy-landing-page (pull request #76) 
Landing now iterates over colors
 2015-09-22 15:18:19 +02:00
TimDaubenschuetz
30f2d75cb4 Merged in AD-1032-style-progress-and-notifications (pull request #74) 
Add style for notification
 2015-09-22 15:17:46 +02:00
TimDaubenschuetz
62e5ce4209 Merged in AD-1027-style-buttons (pull request #77) 
Ad 1027 style buttons
 2015-09-22 15:17:17 +02:00
vrde
259f4b10e3 Style progress bar 2015-09-22 15:13:48 +02:00
vrde
69f0753fc7 Fix color for "open" status for .btn-default 2015-09-22 15:02:36 +02:00
vrde
1885440447 Landing now iterates over colors 2015-09-22 14:46:32 +02:00
Tim Daubenschütz
33b8e51aee Fix react warning for select inputs 2015-09-22 14:13:04 +02:00
TimDaubenschuetz
9cba89b16a Merged in AD-1027-style-buttons (pull request #75) 
Add color for disabled buttons
 2015-09-22 14:01:45 +02:00
vrde
d4f637aa8a Add color for disabled buttons 2015-09-22 13:44:19 +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
vrde
c7321359c9 Add style for notification 2015-09-22 13:37: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
TimDaubenschuetz
159b9a97bf Merged in AD-1038-change-i-agree-to-the-terms-of-s (pull request #73) 
change text in signup form
 2015-09-22 13:13:31 +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
TimDaubenschuetz
bf8b5d2381 Merged in AD-1027-style-buttons (pull request #72) 
Add style for buttons
 2015-09-22 11:49:12 +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
3d75a9523c Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-21 15:23:22 +02:00
Tim Daubenschütz
c756024702 Add whitelabel tailored extra_data forms to piece detail 2015-09-21 15:08:24 +02:00
Alberto Granzotto
887fc99edc Merged in AD-1001-style-header (pull request #70) 
Ad 1001 style header
 2015-09-21 15:06:37 +02:00