Commit Graph

182 Commits

Author SHA1 Message Date
Arvind Tiwari 5d8fb71215 removed redirects form get_context() to get() 2017-09-21 16:38:54 +05:30
Arvind Tiwari 2c4390767d minor fixes 2017-09-21 15:14:15 +05:30
Arvind Tiwari 6c381dd3fb invoice page redesigned 2017-09-21 15:03:00 +05:30
PCoder 0cf8e237b5 Now passing user's language to celery task 2017-09-16 20:55:37 +05:30
PCoder acb739944b Added sending email to user on create vm 2017-09-16 19:30:31 +05:30
PCoder f2ee0ea657 Converting ugettext_lazy proxy to string 2017-09-16 17:54:05 +05:30
PCoder c9fd741c89 Added encode method for ugettext_lazy strings 2017-09-16 17:22:37 +05:30
PCoder 40f13784ac Reverted back to ugettext_lazy in hosting/views 2017-09-16 16:50:14 +05:30
M.Ravi 8c2fd03082 Now responding json HttpResponse for modal on vm create in hosting.
Important: Using ugettext instead of ugettext_lazy in hosting/views.py
2017-09-15 17:34:23 +02:00
PCoder 805f1129e8 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-15 03:34:50 +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 1836d315cd Added query param to distinguish confirm order from invoice 2017-09-10 12:22:32 +05:30
PCoder b1589e9c68 Reorganized imports hosting/views.py 2017-09-09 21:41:20 +05:30
PCoder c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
PCoder d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
PCoder 1a43f4f810 Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 20:30:50 +05:30
M.Ravi e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
2017-09-09 13:27:17 +02:00
M.Ravi c8baf3d4c1 Implemented post method for hosting OrderDetailView 2017-09-09 12:06:29 +02:00
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
M.Ravi 0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
PCoder 2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +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