Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	e137e8a26e
						 | 
						
							
							
								
								
								resolve base.py conflict
							
							
							
							
							
							
						 | 
						
							2016-05-07 23:05:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	342512036d
						 | 
						
							
							
								
								
								Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking
							
							
							
							
							
							
						 | 
						
							2016-05-05 01:03:35 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tom
								
							 
						 | 
						
							
							
								
							
							
	786dbbf895
						 | 
						
							
							
								
								
								remove debugger
							
							
							
							
							
							
						 | 
						
							2016-05-04 17:45:12 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	9f2b3a2a31
						 | 
						
							
							
								
								
								resolve merge conflicts
							
							
							
							
							
							
						 | 
						
							2016-05-04 17:36:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	45730e4eb1
						 | 
						
							
							
								
								
								update dg payment
							
							
							
							
							
							
						 | 
						
							2016-05-01 14:13:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	e7c8258427
						 | 
						
							
							
								
								
								Handled stripe payment errors , Added invoice template, Added view to handle invoice data
							
							
							
							
							
							
						 | 
						
							2016-04-27 01:54:15 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	fdf8722c8f
						 | 
						
							
							
								
								
								Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer
							
							
							
							
							
							
						 | 
						
							2016-04-26 01:16:03 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	4777484245
						 | 
						
							
							
								
								
								Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows
							
							
							
							
							
							
						 | 
						
							2016-04-23 02:22:44 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |