Commit graph

139 commits

Author SHA1 Message Date
PCoder
46642d816a Merged master into task/3731/cdist_ssh_key_handler 2017-08-31 01:09:12 +05:30
M.Ravi
51b1ee2013 Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
2017-08-30 12:02:53 +02:00
M.Ravi
92e47b6f90 Added manage_public_key when deleting a key (However, this does not seem to work in cdist) 2017-08-30 09:42:56 +02:00
M.Ravi
34580b6514 Refactored saving public key functionality to opennebula_api.models.save_public_key. Also, now creating hosting VMs loaded by default with ONEADMIN_USER_SSH_PUBLIC_KEY 2017-08-29 17:53:25 +02:00
PCoder
12255364b2 Attempted to get hosts for adding ssh keys (to be tested) 2017-08-29 13:31:05 +05:30
Arvind Tiwari
23bf602a16 merged master, fixed translation 2017-08-24 20:16:26 +05:30
Pcoder
a77b7b0ab5 Merge pull request #460 from pcoder/add_test_create_vm_celery_task
Added test for create vm celery task
2017-08-23 23:24:49 +02:00
PCoder
6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
Arvind Tiwari
6890c82122 dashboard url, view,template and css added 2017-08-22 20:45:18 +05:30
Arvind Tiwari
653b3654b8 merged master 2017-08-20 22:04:48 +05:30
Arvind Tiwari
de481e8114 invoice link fixed 2017-08-19 02:32:37 +05:30
Arvind Tiwari
377f82319d buttons made to work 2017-08-19 02:21:34 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
Siarhei Puhach
72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00
M.Ravi
d85afd56e0 Fixed an issue
- Changed owner -> user
   - Reformatted code
2017-08-04 17:49:55 +02:00
PCoder
c6b23f6aa0 Added get_object method to verify if the user is the owner of the ssh key 2017-08-04 20:54:28 +05:30
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