| 
						
					 | 
					
						
						
							
						
						55cdfc0509
					 | 
					
						
						
							
							update template using new desk model
						
						
						
						
						
						
					 | 
					
						2017-02-10 19:53:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b76fdc62c
					 | 
					
						
						
							
							rebuild database structure, do single desk models
						
						
						
						
						
						
					 | 
					
						2017-02-10 18:37:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25808f4c5a
					 | 
					
						
						
							
							fix select accountings
						
						
						
						
						
						
					 | 
					
						2017-02-09 20:51:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8dac06a050
					 | 
					
						
						
							
							align text
						
						
						
						
						
						
					 | 
					
						2017-02-09 20:10:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c500baf99
					 | 
					
						
						
							
							fix accounting
						
						
						
						
						
						
					 | 
					
						2017-02-06 21:34:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						24a8099b83
					 | 
					
						
						
							
							fix queue management
						
						
						
						
						
						
					 | 
					
						2017-02-06 21:25:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						528e4647f3
					 | 
					
						
						
							
							make migration
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:32:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						6c01986a89
					 | 
					
						
						
							
							error_msg -> textfield
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:29:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						46c9cdb2d5
					 | 
					
						
						
							
							Merge branch 'develop' of git.einsle.de:carom/carom-server into develop
						
						
						
						
						
						
						
						Conflicts:
	billard/models.py 
						
						
					 | 
					
						2017-02-06 20:28:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						d0e5b90946
					 | 
					
						
						
							
							fixed typo in models
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:27:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e66d729b62
					 | 
					
						
						
							
							add tzinfo for calculating
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:15:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dae777892b
					 | 
					
						
						
							
							add locationdata process logic
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:15:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3a48ac9c6b
					 | 
					
						
						
							
							update celery call
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:14:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						288abf1ad0
					 | 
					
						
						
							
							add celery stuff
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:13:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						567d6007fe
					 | 
					
						
						
							
							Added metadata to models
						
						
						
						
						
						
					 | 
					
						2017-02-06 19:19:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aebcc9af76
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2017-02-05 19:20:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab9569a2b6
					 | 
					
						
						
							
							fix docstring
						
						
						
						
						
						
					 | 
					
						2017-02-05 17:18:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e63f8b7562
					 | 
					
						
						
							
							Calculate prize of rental
						
						
						
						
						
						
					 | 
					
						2017-02-05 17:07:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						858cb5ce8d
					 | 
					
						
						
							
							add http refresh to 3 sec
						
						
						
						
						
						
					 | 
					
						2017-02-05 13:28:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						802810fe0d
					 | 
					
						
						
							
							add client info to accounting admin
						
						
						
						
						
						
					 | 
					
						2017-02-05 13:28:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf20e232d9
					 | 
					
						
						
							
							fix view logic while no location
						
						
						
						
						
						
					 | 
					
						2017-02-05 12:58:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bede78cf84
					 | 
					
						
						
							
							fix toString
						
						
						
						
						
						
					 | 
					
						2017-02-04 12:39:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d4886abe2
					 | 
					
						
						
							
							update view
						
						
						
						
						
						
					 | 
					
						2017-02-04 12:30:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a2eb98d20
					 | 
					
						
						
							
							fix accounting model
						
						
						
						
						
						
					 | 
					
						2017-02-04 11:31:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02bb974a92
					 | 
					
						
						
							
							update accounting model
						
						
						
						
						
						
					 | 
					
						2017-02-04 11:18:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7776bc844c
					 | 
					
						
						
							
							fix view logic
						
						
						
						
						
						
					 | 
					
						2017-02-04 11:13:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db051986a2
					 | 
					
						
						
							
							update location model
						
						
						
						
						
						
					 | 
					
						2017-02-04 06:51:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a7fbfb142
					 | 
					
						
						
							
							fix template matrix for login/logout
						
						
						
						
						
						
					 | 
					
						2017-02-04 06:37:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19719a68b9
					 | 
					
						
						
							
							add login function
						
						
						
						
						
						
					 | 
					
						2017-02-04 06:20:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47ba4b0b67
					 | 
					
						
						
							
							add login_required decorator
						
						
						
						
						
						
					 | 
					
						2017-02-03 09:42:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a003fbcf19
					 | 
					
						
						
							
							update jquery
						
						
						
						
						
						
					 | 
					
						2017-02-02 21:17:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						047a022f7e
					 | 
					
						
						
							
							fix layout of presentation
						
						
						
						
						
						
					 | 
					
						2017-02-02 20:44:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0c090dad9
					 | 
					
						
						
							
							fix access to accounting data
						
						
						
						
						
						
					 | 
					
						2017-02-02 20:43:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16243def6d
					 | 
					
						
						
							
							show accounting data from table
						
						
						
						
						
						
					 | 
					
						2017-02-01 20:25:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90974ea783
					 | 
					
						
						
							
							update view, show location info
						
						
						
						
						
						
					 | 
					
						2017-02-01 18:57:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48a912f04b
					 | 
					
						
						
							
							update data model
						
						
						
						
						
						
					 | 
					
						2017-02-01 17:52:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						616fd63bfc
					 | 
					
						
						
							
							update data model
						
						
						
						
						
						
					 | 
					
						2017-02-01 13:52:30 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						136c1eb363
					 | 
					
						
						
							
							add migration
						
						
						
						
						
						
					 | 
					
						2017-01-06 19:15:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |