Commit Graph

221 Commits

Author SHA1 Message Date
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
Arvind Tiwari 050f750322 merged master 2017-09-26 03:06:12 +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 afc368e9dd Added ResendActivationEmailView 2017-09-24 15:52:17 +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
Arvind Tiwari be0c50aa2f error msgs translation 2017-09-23 19:01:22 +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