Commit graph

104 commits

Author SHA1 Message Date
M.Ravi ab50e58a72 Updated signup and email confirmation views to work with translation 2017-06-17 19:38:43 +05:30
Levi Velázquez 5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
2017-06-15 15:22:00 -05:00
Pcoder ebaadb4d07 Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support
Bug/3313/pwd reset email from dcl support
2017-06-15 21:04:03 +02:00
Levi Velázquez 657e93862d Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support 2017-06-15 01:17:14 -05:00
M.Ravi 5b4e9b733d Tentative fix for error 500 on order details page 2017-06-15 07:30:47 +05:30
M.Ravi a2a3cc1f5a Small code formatting 2017-06-12 20:51:48 +05:30
M.Ravi d84496b0de Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset. 2017-06-12 20:42:17 +05:30
Levi 817f800fbd fixed #3350 2017-06-11 11:44:14 -05:00
M.Ravi c989017a8f Added SignupValidateView and SignupValidatedView classes to handle respective views 2017-06-11 05:18:06 +05:30
Levi d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
Modulos 346733fbcd Allow users to delete ssh keys 2017-06-03 15:03:55 +02:00
modulos ab29b138c3 Add delete ssh key modal 2017-06-03 13:33:05 +02:00
modulos 715d092b96 Add ssh key to new vm
Create_vm now stes to public key correctly
2017-06-02 00:53:22 +02:00
modulos d229d124e9 Merge branch 'develop' into api/cleanup 2017-06-01 21:51:15 +02:00
Levi Velázquez 211e1be0fb Merge pull request #279 from levivm/develop
Develop
2017-05-25 13:05:48 -05:00
Levi d9d8ddc9e1 removed import pdb 2017-05-25 13:05:32 -05:00
Levi 9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
modulos d395735219 Redirect new user to key generation view 2017-05-25 16:23:31 +02:00
modulos 35f129a4c7 Add user generated public ssh keys as well 2017-05-25 15:54:32 +02:00
modulos 9753dfd2fc Add UserHosting public key to opennebula user 2017-05-25 11:27:49 +02:00
Levi ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
Levi 34d596f2ba added next url to ssh create key view 2017-05-21 22:46:31 -05:00
Levi 05bf8db38a added next url to ssh create key view 2017-05-21 22:39:47 -05:00
Levi 02a2ac31c6 added next url to ssh create key view 2017-05-21 22:35:43 -05:00
Levi 3f198bb4de Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro 2017-05-21 22:01:26 -05:00
Levi 03ec8ef674 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-20 11:20:30 -05:00
Levi 5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
Modulos 1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
Levi bcc32174b2 added permissions to hosting bill view 2017-05-13 20:19:09 -05:00
Levi e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 12:22:21 -05:00
Modulos 752e11bcea Readded hostingplans 2017-05-13 13:47:53 +02:00
Modulos 8017fbb90f Work on configuration 2017-05-13 10:00:07 +02:00
Levi d8c8804cc4 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 00:31:33 -05:00
Levi 07dc04018f cleaned code 2017-05-13 00:31:29 -05:00
Modulos 75d93b2aad Add images as configuration 2017-05-13 06:59:57 +02:00
Modulos cfaf201064 Handle ConnectionException, add change_user_password 2017-05-13 05:50:56 +02:00
Levi 8980f6b2fc merged opnnebula api changes 2017-05-12 12:13:18 -05:00
Modulos 130c00c8ee API Integration
Please review carefully.
2017-05-12 12:07:05 +02:00
Levi 3873540849 Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149 2017-05-12 00:56:35 -05:00
Levi 1f10f04a9d Fixed ssh key error, Now an existing user is not ask for his credit card again 2017-05-11 00:11:33 -05:00
Modulos d0fc0144e5 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:56:03 +02:00
Levi 9a34518457 attached opennebula vm id to virtualmachine plan 2017-05-08 21:54:12 -05:00
Levi abf6dbddce added create vm feature from a normal user in opennebula 2017-05-08 21:49:40 -05:00
Modulos 38b2aa8986 Create HostingBill obj when payment's successful 2017-05-09 04:40:41 +02:00
Modulos 3ee075fad9 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:04:53 +02:00
Levi 7ae49d00dd added opennebula manager claass 2017-05-08 19:02:29 -05:00
Modulos c745a8c402 Remove comment
I assume that only clients are StripeCustomer objects
2017-05-08 16:00:42 +02:00
Modulos 3078536bd7 Merge branch 'opennebula-integration' into vm_bill 2017-05-08 15:46:53 +02:00
Levi d72c1c810d added get vms 2017-05-07 18:57:44 -05:00
Modulos b4ec750728 Return error page if HostingBill is None 2017-05-08 01:56:02 +02:00