Commit graph

290 commits

Author SHA1 Message Date
Arvind Tiwari
45df525a37 vm cancel name fix 2017-09-27 03:38:39 +05:30
Arvind Tiwari
f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari
5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari
d888b260ee welcome user mail 2017-09-27 02:45:24 +05:30
Arvind Tiwari
21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
PCoder
e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder
c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder
a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
Arvind Tiwari
050f750322 merged master 2017-09-26 03:06:12 +05:30
PCoder
3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
PCoder
81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder
78abc0c740 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-25 23:55:20 +05:30
PCoder
bb8c1a72fd Add missing import get_language 2017-09-25 23:52:47 +05:30
M.Ravi
a73bcaef05 Store hash 2017-09-25 09:35:18 +02:00
PCoder
7fcece40c1 Using VMDetail model to show order details 2017-09-25 01:49:00 +05:30
PCoder
f2213305f6 Reformatted hosting views.py 2017-09-25 00:46:39 +05:30
PCoder
f2f2fc22df Update VMDetail's terminated_at on delete of a vm 2017-09-25 00:30:28 +05:30
PCoder
f4899ffc18 Added missing get_language import 2017-09-25 00:01:48 +05:30
PCoder
afc368e9dd Added ResendActivationEmailView 2017-09-24 15:52:17 +05:30
M.Ravi
0974376e9f Reformatted code 2017-09-24 09:34:30 +02:00
PCoder
39a2455817 Merged upstream master into task/3730/refactor_price_parameter 2017-09-24 04:20:41 +05:30
PCoder
9491bb81a2 Added missing import after merge 2017-09-24 02:03:48 +05:30
PCoder
656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder
300997699a Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm 2017-09-24 01:08:15 +05:30
Arvind Tiwari
7456baac16 merged master 2017-09-23 23:05:10 +05:30
Arvind Tiwari
363017d85f Merge pull request #488 from tiwariav/task/3777/hosting_calculator
Task/3777 hosting create vm calculator
2017-09-23 22:50:25 +05:30
PCoder
83b52d95ae Merge branch 'master' into task/3730/refactor_price_parameter 2017-09-23 21:18:54 +05:30
Arvind Tiwari
be0c50aa2f error msgs translation 2017-09-23 19:01:22 +05:30
PCoder
99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions 2017-09-23 03:18:05 +05:30
Arvind Tiwari
6004a7ede4 new welcome email 2017-09-23 01:03:43 +05:30
Arvind Tiwari
1c0f0da96e conditional texts 2017-09-21 19:32:22 +05:30
Arvind Tiwari
a16dbb50d8 design fixes 2017-09-21 19:17:10 +05:30
Arvind Tiwari
db3955ab94 error 500 fixed 2017-09-21 17:45:12 +05:30
Arvind Tiwari
a792911dea hosting view fix 2017-09-21 17:22:02 +05:30
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
Arvind Tiwari
1eff51099c exception handling fix 2017-09-21 02:26:42 +05:30
Arvind Tiwari
65618bb2aa merged master 2017-09-20 23:24:20 +05:30
Arvind Tiwari
f4766c7d7c merged master 2017-09-20 23:19:32 +05:30
Arvind Tiwari
3ef07758ef translation and text fix 2017-09-19 01:08:27 +05:30
Arvind Tiwari
78423c83e3 removed error details from error msg 2017-09-19 00:59:51 +05:30
Arvind Tiwari
61bf158238 fix 2017-09-19 00:25:38 +05:30
Arvind Tiwari
8db7ead9e2 checking VM termination error 2017-09-19 00:24:06 +05:30
Arvind Tiwari
226f744bae success modal added 2017-09-18 21:52:59 +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
Arvind Tiwari
556ed75262 translations 2017-09-15 20:14:32 +05:30
Arvind Tiwari
87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
Arvind Tiwari
d49e90bd20 catching WrongIdError 2017-09-15 18:15:06 +05:30
Arvind Tiwari
bbb1919404 error msg fix 2017-09-15 17:38:52 +05:30
Arvind Tiwari
77f2454e3c remove error msg on successful termination 2017-09-15 17:20:42 +05:30
Arvind Tiwari
fdb5039c02 minor adjustments 2017-09-15 16:57:17 +05:30
Arvind Tiwari
6136a48961 edge cases handled 2017-09-15 16:46:56 +05:30
Arvind Tiwari
852c1228ba minor fix 2017-09-15 14:48:11 +05:30
PCoder
805f1129e8 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-15 03:34:50 +05:30
Arvind Tiwari
a935871722 code reformating 2017-09-15 00:57:59 +05:30
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
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