Commit graph

2568 commits

Author SHA1 Message Date
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
PCoder
537e350c8c Redirecting users on creation of accounts to my virtual machines page 2017-09-24 00:22:18 +05:30
PCoder
ea9e62db37 Reverted back django cms ckeditor migration module code 2017-09-23 01:55:21 +05:30
M.Ravi
c362dccd0f Handling payment error response by json 2017-09-22 21:30:42 +02:00
M.Ravi
a48188a190 datacenterlight: Added create vm modal and responding with json 2017-09-22 21:20:00 +02:00
M.Ravi
ab66d25abe Removed some commented code 2017-09-22 13:54:20 +02:00
M.Ravi
0e5a27862a Added base_url and fixed new account emails 2017-09-22 13:46:22 +02:00
M.Ravi
ca73e1bb33 Fixed a logger message 2017-09-22 13:45:15 +02:00
M.Ravi
4c0c1ffb27 Do a user login after creation 2017-09-22 12:46:33 +02:00
M.Ravi
31f7c4a51a Simplified code 2017-09-22 12:38:05 +02:00
M.Ravi
994ffaf117 Send account details in email 2017-09-22 12:01:09 +02:00
M.Ravi
f67b69d490 Formatted code and added condition to create user only if an email does not exist 2017-09-22 11:45:21 +02:00
M.Ravi
e5ad57d3f1 Resolved some issues 2017-09-21 14:29:49 +02:00
PCoder
e2cb70a697 first attempt at refatoring the user creating to order confirmaton page 2017-09-21 06:41:09 +05:30
PCoder
143f40bd2d Merge branch 'task/3756/landing_billing_page' of https://github.com/tiwariav/dynamicweb into tiwariav-task/3756/landing_billing_page 2017-09-21 02:41:26 +05:30
Pcoder
dd3c967500 Merge pull request #490 from pcoder/fix_digitalglarus_subdomain
Fix broken subdomain - digitalglarus.ungliech.ch
2017-09-20 20:52:37 +00:00
PCoder
2c2ee0f4a4 Some more translations 2017-09-21 02:18:39 +05:30
PCoder
3eeaba8715 Added some translations 2017-09-21 02:06:50 +05:30
Arvind Tiwari
0f5bf606da minor fixes 2017-09-20 23:32:48 +05:30
Arvind Tiwari
fc03df4652 merged master 2017-09-20 23:21:24 +05:30
Arvind Tiwari
2223bffa04 Merge pull request #489 from pcoder/task/3772/hosting_billing_monthly_subscription
Task/3772/hosting billing monthly subscription
2017-09-19 15:01:42 +05:30
Arvind Tiwari
4787276afe bootstrap form input box-shadow removed 2017-09-19 13:54:27 +05:30
PCoder
28661c0c48 Replaced all occurrences of digitalglarus.ungliech.ch with digitalglarus.ch 2017-09-18 11:57:41 +05:30
PCoder
3fe6e65e84 Rearranged hold tight text 2017-09-16 21:45:21 +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
PCoder
155a4b7cb6 Added translation and fa-times icon 2017-09-16 15:35:31 +05:30
PCoder
7256160a7b Merge branch 'master' into task/3772/hosting_billing_monthly_subscription 2017-09-16 14:45:34 +05:30
Pcoder
f18cf016d3 Merge pull request #487 from pcoder/bugfix/add_host_to_celery_mails
Bugfix/add hostname to from address in celery error mails
2017-09-16 09:08:32 +00:00
M.Ravi
fe12b9e688 Added simple error handling case 2017-09-15 18:32:11 +02:00
M.Ravi
67f0e9068d Fixed issue with multiline with template statement 2017-09-15 18:16:12 +02:00
M.Ravi
aab9464c6f Rearranged order_detail.html 2017-09-15 18:11:22 +02:00
M.Ravi
fa6901e679 Made create vm modal non responsive to escape key press 2017-09-15 17:55:35 +02:00
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
M.Ravi
e14ed0c69f Added js handling of create vm form submission 2017-09-15 17:30:38 +02:00
M.Ravi
ca5a99ccf5 Reverted autoformatted code 2017-09-15 17:29:41 +02:00
M.Ravi
445b8f4a79 Created virtual_machine_create_form and added ids for elements 2017-09-15 17:17:21 +02:00
M.Ravi
e6514f8061 Refactored DCL_ERROR_EMAILS_TO_ADDRESS to DCL_ERROR_EMAILS_TO 2017-09-15 13:10:11 +02:00
M.Ravi
a06753ca4b Use hostname and send celery errors to DCL_ERROR_EMAILS_TO 2017-09-15 13:09:46 +02:00
M.Ravi
2731ea8635 Fixed getting custom_user when calling create_vm for hosting 2017-09-15 11:32:20 +02:00
PCoder
589a4fcaa9 Added create vm modal 2017-09-15 12:45:11 +05:30
PCoder
0561688f84 Add ssh keys on creation of new VM 2017-09-15 12:43:48 +05:30
PCoder
805f1129e8 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-15 03:34:50 +05:30
Pcoder
d30218297c Merge pull request #473 from pcoder/task/3731/cdist_ssh_key_handler
Task/3731/cdist ssh key handler
2017-09-14 13:41:49 +00:00
M.Ravi
5c3cf7682f Fixed some flake8 warnings 2017-09-14 15:27:25 +02:00
M.Ravi
a4fe2e2db9 Updated SaveSSHKeyTestCase to include add/remove ssh keys 2017-09-14 15:05:28 +02:00
M.Ravi
bd45577c90 Removed unwanted translations in hosting django.po 2017-09-14 14:28:52 +02:00