Commit graph

2542 commits

Author SHA1 Message Date
Arvind Tiwari
4a1596b093 merged master 2017-09-21 19:41:45 +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
f0e50a4e94 removed commented code 2017-09-21 01:20:51 +05:30
Arvind Tiwari
ec354332f8 translation fix 2017-09-20 23:28:36 +05:30
Arvind Tiwari
65618bb2aa merged master 2017-09-20 23:24:20 +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
e893f1baf1 padding fix 2017-09-19 01:17:15 +05:30
Arvind Tiwari
b276194f31 width normalized 2017-09-18 20:18:02 +05:30
Arvind Tiwari
772469a23e design modifications 2017-09-18 19:49:14 +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
Arvind Tiwari
2de0fc13b9 translation fix 2017-09-15 20:17:54 +05:30
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
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
Arvind Tiwari
c2b5c62014 hosting calculator added 2017-09-15 00:49:39 +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
PCoder
face045090 Updated hosting django.po 2017-09-14 00:50:24 +05:30
M.Ravi
86ed0e5319 Removed code related removing keys from known_hosts 2017-09-13 14:32:33 +02:00
M.Ravi
a08104ba2c Updated a comment 2017-09-13 14:31:13 +02:00
M.Ravi
f0d0f2abcc Updated logger message 2017-09-13 12:24:08 +02:00
PCoder
f4dfee2306 Send an email in case of a failed save_ssh_key task 2017-09-13 07:45:16 +05:30
PCoder
d40403c15c Updated hosting django.po 2017-09-13 07:31:22 +05:30
PCoder
d92e850f3e Improved the condition of fetching key name 2017-09-13 07:03:49 +05:30