ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
2,020 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

122 Commits

Author SHA1 Message Date
Pcoder 5b8e73984e Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix 
Bug/3623/hosting my orders header fix
 2017-08-03 23:38:22 +02:00
M.Ravi 8ec692e51b Reformatted code 2017-07-30 18:03:16 +02:00
PCoder 4883294acf Added condition to show Confirm Order only when ordering a VM, and Invoice when order details page 2017-07-30 20:41:11 +05:30
ARvind Tiwari 925252f1c9 merged master 2017-07-28 16:45:34 +05:30
ARvind Tiwari c6a3928638 decoding error fixed 2017-07-27 19:45:55 +05:30
ARvind Tiwari 4216d9911a add ssh key form input shadows removed 2017-07-26 16:45:49 +05:30
PCoder 97acd76b51 Added card holders name for initialization 2017-07-16 22:33:52 +05:30
Siarhei Puhach 062ca69d9d Update views.py 2017-07-12 08:21:43 +03:00
Siarhei Puhach 1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
PCoder cfc1210a9a We probably need creating HostingBill 2017-07-07 00:12:29 +05:30
Siarhei Puhach d2d96e9951 Added private_key field to UserHostingkey model, some html updates 2017-07-06 14:18:22 +03:00
Siarhei Puhach 8986aa6550 Added generation button with no field input required (generate ssh key name) 2017-07-06 11:47:12 +03:00
Siarhei Puhach 7cc70a95ac Added new page(Choice ssh key generate/upload), changed design of generate ssh form 2017-07-05 16:57:49 +03:00
siarheipuhach a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
M.Ravi 0a6275bcef Merge branch 'master' into task/3379/text_style_activation 2017-06-19 12:37:09 +05:30
M.Ravi ab50e58a72 Updated signup and email confirmation views to work with translation 2017-06-17 19:38:43 +05:30
M.Ravi bf99bd5edb Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him 2017-06-17 14:46:11 +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