| 
						
					 | 
					
						
						
							
						
						96dc601542
					 | 
					
						
						
							
							update django-extensions to 1.7.6
						
						
						
						
						
						
					 | 
					
						2017-02-01 11:42:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16d181c8ce
					 | 
					
						
						
							
							Merge branch 'develop' of git.wolke.einsle.de:carom/carom-server into develop
						
						
						
						
						
						
					 | 
					
						2017-01-27 09:37:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e34d4a5a7b
					 | 
					
						
						
							
							local changes
						
						
						
						
						
						
					 | 
					
						2017-01-27 09:37:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be8e072675
					 | 
					
						
						
							
							create templates
						
						
						
						
						
						
					 | 
					
						2017-01-09 20:42:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eaa7a210ce
					 | 
					
						
						
							
							update base view using local jquery
						
						
						
						
						
						
					 | 
					
						2017-01-09 19:30:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a78d3e3193
					 | 
					
						
						
							
							add jquery library
						
						
						
						
						
						
					 | 
					
						2017-01-09 19:23:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c29e8fbef8
					 | 
					
						
						
							
							add authentication classes
						
						
						
						
						
						
					 | 
					
						2017-01-09 19:00:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						99ecd5efc3
					 | 
					
						
						
							
							fix adminview
						
						
						
						
						
						
					 | 
					
						2017-01-09 18:40:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aca77949b0
					 | 
					
						
						
							
							remove unused parameters
						
						
						
						
						
						
					 | 
					
						2017-01-09 18:40:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6610c3b48e
					 | 
					
						
						
							
							Extend LD Model
						
						
						
						
						
						
					 | 
					
						2017-01-09 15:37:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5c21ec8699
					 | 
					
						
						
							
							update template
						
						
						
						
						
						
					 | 
					
						2017-01-09 14:13:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d0da1eb27
					 | 
					
						
						
							
							add first template for location_data object
						
						
						
						
						
						
					 | 
					
						2017-01-09 10:59:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8df0dec1c
					 | 
					
						
						
							
							add basic template
						
						
						
						
						
						
					 | 
					
						2017-01-09 10:27:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f424770eb
					 | 
					
						
						
							
							add bootstrap static files
						
						
						
						
						
						
					 | 
					
						2017-01-09 10:23:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb2b3cf9da
					 | 
					
						
						
							
							add local settings import
						
						
						
						
						
						
					 | 
					
						2017-01-09 08:18:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f98816235
					 | 
					
						
						
							
							update to python3
						
						
						
						
						
						
					 | 
					
						2017-01-09 08:18:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f1604f585d
					 | 
					
						
						
							
							add static_root setting
						
						
						
						
						
						
					 | 
					
						2017-01-09 08:09:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0dff09e4e4
					 | 
					
						
						
							
							fix filemode of manage.py
						
						
						
						
						
						
					 | 
					
						2017-01-09 08:09:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23848eecdd
					 | 
					
						
						
							
							add static file dir to gitignore
						
						
						
						
						
						
					 | 
					
						2017-01-09 08:09:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f806c40b1
					 | 
					
						
						
							
							add local settings
						
						
						
						
						
						
					 | 
					
						2017-01-09 07:27:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7bfaefa41f
					 | 
					
						
						
							
							fix location Data
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:24:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa722fdc9c
					 | 
					
						
						
							
							add locationdata to admin, fix location data model
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:16:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48fd74c020
					 | 
					
						
						
							
							add all allowed hosts
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:15:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						136c1eb363
					 | 
					
						
						
							
							add migration
						
						
						
						
						
						
					 | 
					
						2017-01-06 19:15:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba29b0a351
					 | 
					
						
						
							
							updata location data sting
						
						
						
						
						
						
					 | 
					
						2017-01-06 19:15:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca721ed8b8
					 | 
					
						
						
							
							add location data object
						
						
						
						
						
						
					 | 
					
						2017-01-06 19:11:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a33cacbe98
					 | 
					
						
						
							
							update views
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:59:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df7ad948c1
					 | 
					
						
						
							
							update serializers
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:59:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b3445879fd
					 | 
					
						
						
							
							update .gitignore
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:55:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e1c94100fb
					 | 
					
						
						
							
							update models
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:53:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83e77ec81c
					 | 
					
						
						
							
							add requirements file
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:52:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e83c230c8c
					 | 
					
						
						
							
							update file mode
						
						
						
						
						
						
					 | 
					
						2017-01-06 18:43:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |