| 
								
								
									 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 |  |