Commit graph

836 commits

Author SHA1 Message Date
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
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
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
Arvind Tiwari
d49e90bd20 catching WrongIdError 2017-09-15 18:15:06 +05:30
Arvind Tiwari
9c0cefd419 js polling timing to 5s 2017-09-15 17:44:27 +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
0c3f605735 status pending style in vm-list 2017-09-15 17:02:02 +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
589a4fcaa9 Added create vm modal 2017-09-15 12:45: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
75156d2c00 undo changes in navbar 2017-09-15 01:00:07 +05:30
Arvind Tiwari
a935871722 code reformating 2017-09-15 00:57:59 +05:30
Arvind Tiwari
c2b5c62014 hosting calculator added 2017-09-15 00:49:39 +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
M.Ravi
5c3cf7682f Fixed some flake8 warnings 2017-09-14 15:27:25 +02:00
M.Ravi
bd45577c90 Removed unwanted translations in hosting django.po 2017-09-14 14:28:52 +02:00
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
8ca1b13f80 template fixed 2017-09-14 02:29:51 +05:30
Arvind Tiwari
07a464231d animation added to vm termination 2017-09-14 02:24:10 +05:30
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
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
PCoder
01795dcad0 Verifying if a public key exists already 2017-09-13 06:57:15 +05:30
PCoder
94a5987985 Removed an unwanted print 2017-09-13 06:35:07 +05:30
PCoder
ee5150dc6e strip instead of trim 2017-09-13 06:27:46 +05:30
PCoder
662219f524 Added trim function to clean public ssh key before validating and saving it 2017-09-13 06:07:12 +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
221af96c8b Removed explicit deleting of file with NamedTemporaryFile 2017-09-13 02:46:54 +05:30
PCoder
511a1551d5 Added logger debug message when file not found when deleting 2017-09-13 02:41:19 +05:30
PCoder
2983940d0f Removed unwanted code 2017-09-13 02:33:21 +05:30
PCoder
3770489a49 Writing bytes to NamedTemporaryFile 2017-09-13 02:31:19 +05:30
PCoder
261615e701 Using ssh-keygen to validate public key 2017-09-13 02:22:29 +05:30
Arvind Tiwari
6237469ab2 mobile order fixed 2017-09-13 01:55:58 +05:30
PCoder
4ce914b178 Removed some code that was not used 2017-09-13 01:11:34 +05:30
PCoder
825a994979 Updated hosting django.po 2017-09-13 00:10:45 +05:30
PCoder
8c3544c0a4 Formatted code and added text - ending in 2017-09-13 00:01:10 +05:30
Arvind Tiwari
5f6f2e4ca9 added more translations 2017-09-11 23:52:30 +05:30
Arvind Tiwari
5d9a20dd94 merged master and added translations 2017-09-11 23:47:35 +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
d4e73f4c74 Merge branch 'master' into task/3756/landing_billing_page 2017-09-09 02:13:24 +05:30
Arvind Tiwari
7a4573f7ad user logged in after signup on payment page 2017-09-09 02:10:25 +05:30
Arvind Tiwari
e9e72f4883 hosting navbar logo link fixed to dcl landing 2017-09-09 00:46:13 +05:30
Arvind Tiwari
de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
Arvind Tiwari
daba6ae2fb merged master 2017-09-08 20:22:22 +05:30
Arvind Tiwari
3852d26f37 merged master 2017-09-08 20:13:17 +05:30
Arvind Tiwari
60bc1a86b3 font weight on mobile 2017-09-08 03:52:24 +05:30
Arvind Tiwari
fc170462e2 font weight on mobile 2017-09-08 03:41:25 +05:30
Arvind Tiwari
bbee940720 padding fix 2017-09-08 03:19:08 +05:30
Arvind Tiwari
3b8c3265ca Merge pull request #484 from tiwariav/task/3779/transparent_navbar
Task/3779 transparent navbar on signup-validate pages
2017-09-08 02:57:10 +05:30
Arvind Tiwari
6a56f4c689 logo position fix 2017-09-08 02:43:11 +05:30
Arvind Tiwari
9721784ff2 logo href fixed 2017-09-08 02:32:46 +05:30
Arvind Tiwari
4937baa2e0 dropdown style updated 2017-09-08 02:22:03 +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
84d35ea916 padding fixed 2017-09-08 00:11:20 +05:30
Arvind Tiwari
b4641e9dfd font wieght 300 2017-09-08 00:07:09 +05:30
Arvind Tiwari
73bbe29113 transparent navbar added to signup validate page 2017-09-07 22:47:56 +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
Arvind Tiwari
db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
Arvind Tiwari
0ed104cd56 logged in user 2017-09-07 19:56:34 +05:30
M.Ravi
ec300a76eb Handled some more errors that can be generated when creating SSHKey 2017-09-07 00:44:53 +02:00
M.Ravi
cf6bd8a7c1 Validating ssh public keys using sshpubkeys 2017-09-07 00:31:15 +02:00
M.Ravi
0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
M.Ravi
67ab4ef0a1 hosting: Added order-confirmation url 2017-09-06 23:50:19 +02:00
M.Ravi
df23862ea1 Added per month text for price 2017-09-06 23:49:38 +02:00
Arvind Tiwari
db90ea8713 new translations 2017-09-07 02:51:07 +05:30
Arvind Tiwari
98e8be1da9 landing payment page layout complete 2017-09-07 02:47:57 +05:30
PCoder
2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30
Arvind Tiwari
aaf3bc18d8 landing_payment all sections arranged 2017-09-06 00:12:13 +05:30
Arvind Tiwari
d13d9bf441 removed edit option from card details 2017-09-05 22:09:18 +05:30
Arvind Tiwari
5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
Arvind Tiwari
09b80467b9 landing payment page cleanup 2017-09-05 00:24:18 +05:30
Arvind Tiwari
3ff0c4a1a2 merged master 2017-09-04 23:52:22 +05:30
PCoder
f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
PCoder
8ac8b25d78 Updated new vm email template 2017-09-04 12:32:53 +05:30
M.Ravi
f7129e0b23 Removed an invalid quote from cancel email template 2017-09-03 17:49:31 +02:00
M.Ravi
da4ca01524 Fixed hosting django.po error 2017-09-03 17:16:25 +02:00
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
M.Ravi
0d4c40cfa2 Fixed missing trans tag in _footer.html 2017-09-03 12:44:42 +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
PCoder
1c42623964 Fixed some password reset email translation issues 2017-09-02 16:24:25 +05:30
PCoder
f701f10e24 Added missing site_name 2017-09-02 16:07:05 +05:30
PCoder
22f07837e0 Added missing password_reset_url 2017-09-02 16:05:24 +05:30
PCoder
00e4ae5b76 Added missing new line character 2017-09-02 16:03:39 +05:30
PCoder
b4ba882c9c Added password reset email translation 2017-09-02 16:01:39 +05:30
PCoder
7c70ee637a Updated password reset template 2017-09-02 15:56:17 +05:30
PCoder
fd87023681 Merge branch 'master' into task/3731/cdist_ssh_key_handler 2017-09-02 11:00:40 +05:30
Arvind Tiwari
95f4cb3753 fix 2017-09-02 03:14:02 +05:30
Arvind Tiwari
b9f0a886e0 translation fixes 2017-09-02 03:09:02 +05:30
Arvind Tiwari
4b24c227ee Merge pull request #476 from tiwariav/bugfix/hosting_payment_navbar
bugfix/hosting datacenterlight payment template separated
2017-09-02 02:04:32 +05:30
Arvind Tiwari
979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari
fa5bf56f73 Merge pull request #475 from tiwariav/bugfix/translation
Bugfix/translation
2017-09-02 01:50:29 +05:30
Arvind Tiwari
1426cba3a5 approved, declined translations added 2017-09-02 01:48:51 +05:30
Arvind Tiwari
6f091279d7 translation fix on vm list page 2017-09-02 01:45:07 +05:30
Arvind Tiwari
5f384d430b Merge pull request #474 from tiwariav/task/3735/modal_btn_width
Task/3735 modal btn min-width, modal width increased
2017-09-02 00:32:08 +05:30
Arvind Tiwari
765432acbc minor fix 2017-09-02 00:17:01 +05:30
Arvind Tiwari
4a3ab29bd5 minor fix 2017-09-02 00:14:12 +05:30
Arvind Tiwari
31552b886f btn styles fixed 2017-09-02 00:11:16 +05:30
Arvind Tiwari
79cf5e416c modal btn min width, modal width increased 2017-09-01 23:56:01 +05:30
Arvind Tiwari
2fe3232d91 Merge branch 'master' into task/3704/my_settings 2017-09-01 23:14:32 +05:30
Arvind Tiwari
b622e53313 translation fix, master merged 2017-09-01 23:13:54 +05:30
Arvind Tiwari
03a96f5457 Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
Task/3678 remove lato font files
2017-09-01 22:53:52 +05:30
Arvind Tiwari
b1baf564db navbar-header clickable, contact href fixed, highlights focus color fixed 2017-09-01 02:05:24 +05:30
Arvind Tiwari
5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
PCoder
8eca78b043 Reorganized imports hosting/forms.py 2017-09-01 00:58:30 +05:30
PCoder
3b0d2f8802 Merge branch 'master' into task/3731/cdist_ssh_key_handler 2017-09-01 00:53:30 +05:30
Arvind Tiwari
3ed2399337 merge master 2017-09-01 00:39:01 +05:30
Arvind Tiwari
d0e770d0df merge conflict resolved 2017-08-31 23:47:42 +05:30
Arvind Tiwari
e94f9a5d2b dropdown style fix 2017-08-31 23:42:18 +05:30