| 
						
					 | 
					
						
						
							
						
						a782d79c29
					 | 
					
						
						
							
							remove idea filder
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:40:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e171f14af7
					 | 
					
						
						
							
							fix git ignore file
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:39:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94df28530e
					 | 
					
						
						
							
							Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop
						
						
						
						
						
						
					 | 
					
						2017-01-03 20:15:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa27510b84
					 | 
					
						
						
							
							fix lines
						
						
						
						
						
						
					 | 
					
						2017-01-03 20:13:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						363fb584f6
					 | 
					
						
						
							
							Updated rest data
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:55:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ded2d189bb
					 | 
					
						
						
							
							fix list_display
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:50:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						422287ad11
					 | 
					
						
						
							
							add sqlite to gitignore
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:48:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8cbf4e9e78
					 | 
					
						
						
							
							add admin decorators
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:48:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e875101c9
					 | 
					
						
						
							
							add admin page
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:40:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						38cd810017
					 | 
					
						
						
							
							settings update
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:32:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						bb519cb96f
					 | 
					
						
						
							
							Initial migration
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:29:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						a51c2cf733
					 | 
					
						
						
							
							Added billard app
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:27:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c297407135
					 | 
					
						
						
							
							Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:12:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						d4a8298725
					 | 
					
						
						
							
							Updated settings, urls, restframework
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:11:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff9795327a
					 | 
					
						
						
							
							Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:11:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6756e73bc8
					 | 
					
						
						
							
							add .gitignore
						
						
						
						
						
						
					 | 
					
						2017-01-03 19:02:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						6d90f874ad
					 | 
					
						
						
							
							Started django app
						
						
						
						
						
						
					 | 
					
						2017-01-03 18:57:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						661c7b67a0
					 | 
					
						
						
							
							Add readme.rstC
						
						
						
						
						
						
					 | 
					
						2017-01-03 18:46:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |