Commit Graph

171 Commits

Author SHA1 Message Date
Arvind Tiwari 8402fd4fd3 merge master 2017-09-15 00:19:01 +05:30
Arvind Tiwari a1a90ed5d0 while loop code formating 2017-09-15 00:14:09 +05:30
Arvind Tiwari 8393afe141 translations and test methods removed 2017-09-14 02:59:08 +05:30
Arvind Tiwari e045caebbe redirect on success 2017-09-14 02:52:37 +05:30
Arvind Tiwari a808f3bf7e error fix on termination 2017-09-14 02:48:56 +05:30
Arvind Tiwari abc290de61 added error msg 2017-09-14 02:43:01 +05:30
Arvind Tiwari 07a464231d animation added to vm termination 2017-09-14 02:24:10 +05:30
M.Ravi 86ed0e5319 Removed code related removing keys from known_hosts 2017-09-13 14:32:33 +02:00
PCoder 94a5987985 Removed an unwanted print 2017-09-13 06:35:07 +05:30
PCoder 612e11736e Corrected obtaining values from vm_data dict 2017-09-13 05:37:26 +05:30
PCoder f94ed011e5 Remove keys from known_hosts on delete of a vm 2017-09-13 05:30:05 +05:30
PCoder 1a43f4f810 Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 20:30:50 +05:30
PCoder f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 13:44:46 +05:30
PCoder 1d5f92f7e1 Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email 2017-09-09 12:12:56 +05:30
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari d5c0fef965 Merge pull request #483 from tiwariav/task/3775/hosting_default_page
Task/3775 hosting/dashboard as default page
2017-09-08 02:03:08 +05:30
Arvind Tiwari e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard 2017-09-07 22:24:03 +05:30
PCoder f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
M.Ravi 43e4c021a7 Removed order id from cancel vm email templates 2017-09-03 17:13:49 +02:00
M.Ravi a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
PCoder f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi 8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi 50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder 7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
M.Ravi 5a46cea307 Added functionality to add keys on creating a new vm 2017-08-31 18:20:02 +02:00
Arvind Tiwari a07922e4d4 style and translations fix 2017-08-31 15:54:01 +05:30
PCoder 46642d816a Merged master into task/3731/cdist_ssh_key_handler 2017-08-31 01:09:12 +05:30
Arvind Tiwari 43ceea948e merged master 2017-08-30 19:38:19 +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
Arvind Tiwari ce1d346bc1 billing form in settings page 2017-08-29 17:42:35 +05:30
PCoder 12255364b2 Attempted to get hosts for adding ssh keys (to be tested) 2017-08-29 13:31:05 +05:30
Arvind Tiwari daa50d4672 settings page design 2017-08-24 22:11:15 +05:30
Arvind Tiwari c87e2cd36b hosting settings url, view and template added 2017-08-24 20:28:02 +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