| 
								
								
									 Arvind Tiwari | 050f750322 | merged master | 2017-09-26 03:06:12 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | b782c6212a | Merge remote-tracking branch 'ungleich/master' | 2017-09-26 02:53:25 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | a37c734c94 | translation fix | 2017-09-26 02:53:09 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | f35c3dbc10 | modal check icon thinner, terminate modal text smaller | 2017-09-26 02:38:31 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 543465e89b | Update Changelog for 1.2.3 | 2017-09-26 02:34:10 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 29a45e81bf | Include cdist 4.7.0 in requirements.txt | 2017-09-26 02:24:17 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 7933584942 | Updated changelog | 2017-09-26 02:13:49 +05:30 |  | 
				
					
						| 
								
								
									 Pcoder | 3095b64561 | Merge pull request #498 from pcoder/task/3781/resend_activation_mail Task/3781/resend activation mail | 2017-09-25 20:39:20 +00:00 |  | 
				
					
						| 
								
								
									 PCoder | 6bf89669ef | some more de translations | 2017-09-26 02:07:28 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 3b55e331ed | Merge branch 'master' into task/3764/show_cancelled_vms_my_orders | 2017-09-26 01:58:42 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 75ff7e4ea8 | Added some translations | 2017-09-26 01:53:19 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 1fdc533f4d | bills list page updated | 2017-09-26 01:18:39 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 81bc5d5555 | Merge branch 'master' into task/3781/resend_activation_mail | 2017-09-26 01:18:02 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 230866e563 | Merge branch 'master' into task/3808/dcl_order_confirm | 2017-09-26 01:10:16 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | a646fef2c7 | merged master | 2017-09-26 01:09:45 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 25f3118126 | Updated Changelog | 2017-09-26 01:06:41 +05:30 |  | 
				
					
						| 
								
								
									 Pcoder | ed4c968974 | Merge pull request #501 from pcoder/bug/3806/cannot_create_vms_after_password_reset Fix cannot create vms after password reset | 2017-09-25 19:34:39 +00:00 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 63ea7dac37 | datacenterlight invoice redesigned | 2017-09-26 01:04:38 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 6321f44c08 | Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset | 2017-09-26 00:54:33 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 177c4719e1 | Merge remote-tracking branch 'mainRepo/master' | 2017-09-26 00:53:58 +05:30 |  | 
				
					
						| 
								
								
									 verysanghee | f35663b5ac | Update django.po | 2017-09-25 21:18:46 +02:00 |  | 
				
					
						| 
								
								
									 verysanghee | e85a7c9e2a | Update django.po | 2017-09-25 21:14:19 +02:00 |  | 
				
					
						| 
								
								
									 verysanghee | 2f4b7bb749 | Update django.po | 2017-09-25 21:07:33 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | f0ba9a0c0c | Updated hosting django.po | 2017-09-26 00:36:06 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | a9755ccbff | Updated hosting django.po | 2017-09-26 00:34:33 +05:30 |  | 
				
					
						| 
								
								
									 verysanghee | 889d737c7c | Update django.po | 2017-09-25 20:58:59 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | e2779314b0 | Fix cancel vm modal text translation | 2017-09-26 00:25:54 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | c2844d25ed | Corrected a de spelling | 2017-09-26 00:06:17 +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 |  | 
				
					
						| 
								
								
									 verysanghee | 04c29d0622 | Update django.po | 2017-09-25 20:17:12 +02:00 |  | 
				
					
						| 
								
								
									 M.Ravi | a73bcaef05 | Store hash | 2017-09-25 09:35:18 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 70d5efb21a | Update hosting django.po with a de translation | 2017-09-25 02:09:49 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 46d82268f4 | Show terminated in invoice for VM that has been terminated | 2017-09-25 02:04:40 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 7fcece40c1 | Using VMDetail model to show order details | 2017-09-25 01:49:00 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | f2213305f6 | Reformatted hosting views.py | 2017-09-25 00:46:39 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 83ccb9cffa | Added vmdetail migration file | 2017-09-25 00:36:33 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 114511e924 | Fixed some flake8 warnings | 2017-09-25 00:34:18 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | f2f2fc22df | Update VMDetail's terminated_at on delete of a vm | 2017-09-25 00:30:28 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 7278a20135 | Added get_or_create_vm_detail function | 2017-09-25 00:02:36 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | f4899ffc18 | Added missing get_language import | 2017-09-25 00:01:48 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | a45679d89a | Added VMDetail model | 2017-09-25 00:00:45 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | cd5607b44e | Updated hosting django.po | 2017-09-24 19:04:18 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 84db1606a3 | Added resend_activation_link.html template file | 2017-09-24 18:04:11 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 24522908e0 | Added resend activation link to login page | 2017-09-24 16:02:06 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 3e32e5127b | Added ResendActivationLinkViewMixin | 2017-09-24 15:55:52 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | af426c5b7a | Added ResendActivationEmailForm and translation function to untranslated texts | 2017-09-24 15:54:45 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 3247616137 | Added resend activation link url | 2017-09-24 15:53:08 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | afc368e9dd | Added ResendActivationEmailView | 2017-09-24 15:52:17 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 0974376e9f | Reformatted code | 2017-09-24 09:34:30 +02:00 |  |