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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	9f2b3a2a31
						 | 
						
							
							
								
								
								resolve merge conflicts
							
							
							
							
							
							
						 | 
						
							2016-05-04 17:36:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	3b387d61db
						 | 
						
							
							
								
								
								added test
							
							
							
							
							
							
						 | 
						
							2016-05-02 02:00:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	45730e4eb1
						 | 
						
							
							
								
								
								update dg payment
							
							
							
							
							
							
						 | 
						
							2016-05-01 14:13:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	c4bf4fc6ff
						 | 
						
							
							
								
								
								Fixed error creating stripe customer
							
							
							
							
							
							
						 | 
						
							2016-04-30 14:29:16 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	e0fc542673
						 | 
						
							
							
								
								
								fix merge conflict
							
							
							
							
							
							
						 | 
						
							2016-04-28 19:47:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	0fc96880ef
						 | 
						
							
							
								
								
								update dg
							
							
							
							
							
							
						 | 
						
							2016-04-28 19:42:01 +02: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	213f295394
						 | 
						
							
							
								
								
								digitalglarus booking update
							
							
							
							
							
							
						 | 
						
							2016-04-23 19:00:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	1d18894b60
						 | 
						
							
							
								
								
								updated main pages links
							
							
							
							
							
							
						 | 
						
							2016-04-01 12:37:01 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0d04a18a0d
						 | 
						
							
							
								
								
								server push
							
							
							
							
							
							
						 | 
						
							2016-03-19 21:28:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	6319515bb4
						 | 
						
							
							
								
								
								fixed new user registration
							
							
							
							
							
							
						 | 
						
							2016-03-16 15:10:48 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	ff9a6e1b2b
						 | 
						
							
							
								
								
								fixed requirements
							
							
							
							
							
							
						 | 
						
							2016-03-16 00:26:49 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	e5d2d74450
						 | 
						
							
							
								
								
								payment app
							
							
							
							
							
							
						 | 
						
							2016-03-11 19:42:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	2477fbc11b
						 | 
						
							
							
								
								
								update req file and update directory structure
							
							
							
							
							
							
						 | 
						
							2016-03-07 19:20:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	b8824b3f46
						 | 
						
							
							
								
								
								fixed CustomUser
							
							
							
							
							
							
						 | 
						
							2016-03-07 18:39:24 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	3157db235a
						 | 
						
							
							
								
								
								test
							
							
							
							
							
							
						 | 
						
							2016-03-07 17:49:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	9f944ca1ed
						 | 
						
							
							
								
								
								init membership
							
							
							
							
							
							
						 | 
						
							2016-03-03 22:55:23 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |