PCoder
								
							 
						 | 
						
							
							
								
							
							
	8a30100488
						 | 
						
							
							
								
								
								Use price in stripe plan name too
							
							
							
							
							
							
						 | 
						
							2018-09-05 23:26:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	34ed51a643
						 | 
						
							
							
								
								
								Don't dissociate card if transaction fails
							
							
							
							
							
							
						 | 
						
							2018-07-07 02:03:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	0f26917f35
						 | 
						
							
							
								
								
								Fix PEP8 warning
							
							
							
							
							
							
						 | 
						
							2018-07-07 01:54:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	678167978c
						 | 
						
							
							
								
								
								Add check to forbid user from deleting the last card
							
							
							
							
							
							
						 | 
						
							2018-07-07 01:50:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c118e86230
						 | 
						
							
							
								
								
								Remove unused context parameters -- introduced during merge
							
							
							
							
							
							
						 | 
						
							2018-07-03 23:56:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c9d01ba95f
						 | 
						
							
							
								
								
								Fix some errors
							
							
							
							
							
							
						 | 
						
							2018-07-03 21:52:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	6d2b011925
						 | 
						
							
							
								
								
								Merge master into task/3747/multiple_cards_support
							
							
							
							
							
							
						 | 
						
							2018-07-03 21:29:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	5eff54cffe
						 | 
						
							
							
								
								
								Fix a bug -- json not imported; use JsonResponse instead of
							
							
							
							
							
							
							
							
							HttpResponse 
							
						 | 
						
							2018-06-27 12:34:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	2cd73b313a
						 | 
						
							
							
								
								
								Merge master into task/3934/move_hosting_order_out_of_celery_task
							
							
							
							
							
							
							
							
							and resolve some conflicts 
							
						 | 
						
							2018-06-27 12:09:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	fae9fce5c6
						 | 
						
							
							
								
								
								Remove unnecessary code
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:15:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	6db38d7e29
						 | 
						
							
							
								
								
								Check card_id also for order confirmation
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:14:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	86f0526773
						 | 
						
							
							
								
								
								Reformat code
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:13:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7494116468
						 | 
						
							
							
								
								
								Add missing import
							
							
							
							
							
							
						 | 
						
							2018-06-12 09:36:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	cf00ff6bd8
						 | 
						
							
							
								
								
								Attempt to merge master into task/3747/multiple_cards_support
							
							
							
							
							
							
						 | 
						
							2018-06-12 08:16:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	8044e0c2a0
						 | 
						
							
							
								
								
								calculator discount text modified
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55cbe3244a
						 | 
						
							
							
								
								
								fix testing error
							
							
							
							
							
							
						 | 
						
							2018-05-07 09:14:31 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3d2ce27954
						 | 
						
							
							
								
								
								fix discount amount
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:29:53 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	eeed9b2e72
						 | 
						
							
							
								
								
								discount name in templates
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:25:50 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	2ff8c25034
						 | 
						
							
							
								
								
								exclude discount from total price
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:11:44 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f8dc2c6bbe
						 | 
						
							
							
								
								
								discount option added to calculator
							
							
							
							
							
							
						 | 
						
							2018-05-07 05:07:58 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	0c4c945ec3
						 | 
						
							
							
								
								
								flake8 fix
							
							
							
							
							
							
						 | 
						
							2018-04-25 17:51:36 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	91a65e88ec
						 | 
						
							
							
								
								
								hosting vm payment price fix
							
							
							
							
							
							
						 | 
						
							2018-04-25 16:08:05 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f66d768ecb
						 | 
						
							
							
								
								
								hosting payment page
							
							
							
							
							
							
						 | 
						
							2018-04-25 15:55:58 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3bf064a017
						 | 
						
							
							
								
								
								add calculator placeholder to cms_integration
							
							
							
							
							
							
						 | 
						
							2018-04-25 14:52:25 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	a5bd8347e8
						 | 
						
							
							
								
								
								merged master
							
							
							
							
							
							
						 | 
						
							2018-04-21 21:01:42 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3debf34118
						 | 
						
							
							
								
								
								remove vm creation to util function
							
							
							
							
							
							
						 | 
						
							2018-04-20 20:25:24 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	bd875ffe7d
						 | 
						
							
							
								
								
								Create hostingorder outside celery task
							
							
							
							
							
							
						 | 
						
							2018-04-18 23:50:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	36c0b9a0a6
						 | 
						
							
							
								
								
								Differentiate price and total_price in hosting order_detail
							
							
							
							
							
							
						 | 
						
							2018-04-17 22:23:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c2513dc7c3
						 | 
						
							
							
								
								
								Show vat_percent and subtotal for vat exclusive case
							
							
							
							
							
							
						 | 
						
							2018-04-17 21:38:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	1e76864821
						 | 
						
							
							
								
								
								Get vm price and vat and pass it to context
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:46:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	731fef8ad9
						 | 
						
							
							
								
								
								Show VAT details in hosting/order_details if it is set
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:39:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	602ad1b2c0
						 | 
						
							
							
								
								
								Reformat code
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:32:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	b71fec7e61
						 | 
						
							
							
								
								
								Fix a bug: use vm_pricing instead of pricing
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:00:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a8339a23a9
						 | 
						
							
							
								
								
								Use get_vm_price_with_vat in hosting invoice
							
							
							
							
							
							
						 | 
						
							2018-04-16 03:27:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	698cf7f1ee
						 | 
						
							
							
								
								
								Fix link in signup message
							
							
							
							
							
							
						 | 
						
							2018-04-07 13:16:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7b1cb975df
						 | 
						
							
							
								
								
								Fix Method Resolution Order
							
							
							
							
							
							
						 | 
						
							2018-04-07 13:15:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	f911d6b403
						 | 
						
							
							
								
								
								Add HostingContextMixin to various hosting views
							
							
							
							
							
							
						 | 
						
							2018-04-07 12:53:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	52dafc99d3
						 | 
						
							
							
								
								
								ungleich gmbh -> ungleich glarus ag, settings page fix
							
							
							
							
							
							
						 | 
						
							2018-03-27 00:54:44 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a7a0ec8864
						 | 
						
							
							
								
								
								Add no_cache decorators instead of cache_control
							
							
							
							
							
							
						 | 
						
							2018-03-09 19:49:40 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	d933f71fe9
						 | 
						
							
							
								
								
								Merge branch 'master' into task/3452/back_button_mgmt
							
							
							
							
							
							
						 | 
						
							2018-03-03 11:37:41 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	dd9b0d8fd9
						 | 
						
							
							
								
								
								Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX
							
							
							
							
							
							
						 | 
						
							2018-01-08 19:50:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	0706ac5909
						 | 
						
							
							
								
								
								Shorten generated ssh key and add seconds to the name
							
							
							
							
							
							
						 | 
						
							2018-01-08 19:35:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	1395c04a00
						 | 
						
							
							
								
								
								Add cache_control to CreateVirtualMachinesView and VirtualMachineView
							
							
							
							
							
							
						 | 
						
							2017-12-27 09:10:41 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	639e4cf414
						 | 
						
							
							
								
								
								Add get method and cache_control to OrdersHostingListView
							
							
							
							
							
							
						 | 
						
							2017-12-27 09:09:54 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	14ff876fbf
						 | 
						
							
							
								
								
								Add cache_control to PaymentVMView and OrdersHostingDetailView
							
							
							
							
							
							
						 | 
						
							2017-12-27 09:06:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	ab06eeff67
						 | 
						
							
							
								
								
								Add cache_control to SSHKEyCreateView and SettingsView post methods
							
							
							
							
							
							
						 | 
						
							2017-12-27 09:04:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	98e06686f9
						 | 
						
							
							
								
								
								Add get method and cache_control to SignupValidatedView
							
							
							
							
							
							
						 | 
						
							2017-12-27 09:03:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	bec541c06a
						 | 
						
							
							
								
								
								Add get method to hosting.SignupView and cache_control
							
							
							
							
							
							
						 | 
						
							2017-12-27 08:33:53 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	87cdb08f3c
						 | 
						
							
							
								
								
								Change success_url in hosting.SignupView from ssh_keys to dashboard
							
							
							
							
							
							
						 | 
						
							2017-12-27 08:32:55 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	d796272c10
						 | 
						
							
							
								
								
								Add cache_control headers to get and post methods
							
							
							
							
							
							
						 | 
						
							2017-12-25 15:54:23 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |