Levi
								
							 
						 | 
						
							
							
								
							
							
	bf0e152789
						 | 
						
							
							
								
								
								Merge branch 'develop' into feature/vm_pricing
							
							
							
							
							
							
						 | 
						
							2016-05-04 22:07:30 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	52ea4eec49
						 | 
						
							
							
								
								
								resolve merge conflicts
							
							
							
							
							
							
						 | 
						
							2016-05-04 17:36:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	a99ea335c8
						 | 
						
							
							
								
								
								Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page
							
							
							
							
							
							
						 | 
						
							2016-05-04 00:16:41 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	906df2a111
						 | 
						
							
							
								
								
								Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page
							
							
							
							
							
							
						 | 
						
							2016-05-03 00:59:40 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	65e3cdeb94
						 | 
						
							
							
								
								
								update dg payment
							
							
							
							
							
							
						 | 
						
							2016-05-01 14:13:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	de48f1ce69
						 | 
						
							
							
								
								
								Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view  to  list all user’s orders, Adding some style to pricing template
							
							
							
							
							
							
						 | 
						
							2016-04-29 01:53:24 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	69f9f4a416
						 | 
						
							
							
								
								
								fix merge conflict
							
							
							
							
							
							
						 | 
						
							2016-04-28 19:47:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tomislav R
								
							 
						 | 
						
							
							
								
							
							
	a493ad225d
						 | 
						
							
							
								
								
								update dg
							
							
							
							
							
							
						 | 
						
							2016-04-28 19:42:01 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	46ab364184
						 | 
						
							
							
								
								
								Handled stripe payment errors , Added invoice template, Added view to handle invoice data
							
							
							
							
							
							
						 | 
						
							2016-04-27 01:54:15 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	38801abed7
						 | 
						
							
							
								
								
								Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors
							
							
							
							
							
							
						 | 
						
							2016-04-22 08:36:38 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	4e23adcea6
						 | 
						
							
							
								
								
								Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors
							
							
							
							
							
							
						 | 
						
							2016-04-20 01:03:32 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	9694681dd2
						 | 
						
							
							
								
								
								Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change
							
							
							
							
							
							
						 | 
						
							2016-04-19 01:04:42 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2bf346495e
						 | 
						
							
							
								
								
								begin refactor to /hosting/
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-27 18:20:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |