Alexander Werner
							
						 
					 | 
					
						
						
							
						
						a968e59cf1
					 | 
					
						
						
							
							fixed error if report_user not set
						
						
						
						
						
						
					 | 
					
						2017-03-09 19:50:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						bd48677953
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 20:13:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						61a5c3ee04
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 20:11:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						e7a25888a7
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 20:05:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						51a5d1659a
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:48:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						323ab5ae98
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:44:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						8e95ae4ff5
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:31:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						d2e56b99b8
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:22:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						716cb2d347
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:04:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						1a7cce0934
					 | 
					
						
						
							
							Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:03:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						13fa332679
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:03:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8367f002c3
					 | 
					
						
						
							
							move to explicit imports
						
						
						
						
						
						
					 | 
					
						2017-03-06 18:54:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						63e9c348a0
					 | 
					
						
						
							
							updated modal code
						
						
						
						
						
						
					 | 
					
						2017-03-06 18:43:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f89306dfde
					 | 
					
						
						
							
							updating admin
						
						
						
						
						
						
					 | 
					
						2017-03-02 21:01:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						943ff5ad21
					 | 
					
						
						
							
							update model
						
						
						
						
						
						
					 | 
					
						2017-03-02 20:59:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea2ed0d6a1
					 | 
					
						
						
							
							Merge branch 'feature/#3_accounting_dialog' of ssh://git.einsle.de:5000/carom/carom-server into feature/#3_accounting_dialog
						
						
						
						
						
						
					 | 
					
						2017-03-02 20:54:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4df4a095cb
					 | 
					
						
						
							
							update calculating prize for accounting
						
						
						
						
						
						
					 | 
					
						2017-03-02 20:51:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						3a2c21cbc2
					 | 
					
						
						
							
							Added modal view
						
						
						
						
						
						
					 | 
					
						2017-03-02 20:25:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4a68683fa
					 | 
					
						
						
							
							update accounting using location data uuid
						
						
						
						
						
						
					 | 
					
						2017-02-27 08:01:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a36d3904e
					 | 
					
						
						
							
							extend accounting model
						
						
						
						
						
						
					 | 
					
						2017-02-27 07:58:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1323976521
					 | 
					
						
						
							
							fix error in model
						
						
						
						
						
						
					 | 
					
						2017-02-26 12:37:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2eb8802e83
					 | 
					
						
						
							
							show version info in menu not in footer
						
						
						
						
						
						
					 | 
					
						2017-02-26 12:28:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9c483c8d3
					 | 
					
						
						
							
							fix error in view.py
						
						
						
						
						
						
					 | 
					
						2017-02-26 12:20:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e22a153201
					 | 
					
						
						
							
							fix processingo of ld objects
						
						
						
						
						
						
					 | 
					
						2017-02-26 12:03:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eab72df9ac
					 | 
					
						
						
							
							fix error calculating prize
						
						
						
						
						
						
					 | 
					
						2017-02-26 11:24:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce9e54f21d
					 | 
					
						
						
							
							carom/carom-doc#6
						
						
						
						
						
						
						
						Anzeige des Preises pro Tisch 
						
						
					 | 
					
						2017-02-26 10:37:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ed10884e2
					 | 
					
						
						
							
							carom/carom-doc#6
						
						
						
						
						
						
						
						Anzeige des PReises pro Tisch 
						
						
					 | 
					
						2017-02-26 10:32:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e6cc938aa
					 | 
					
						
						
							
							add version info in footer
						
						
						
						
						
						
					 | 
					
						2017-02-25 20:30:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa00563195
					 | 
					
						
						
							
							carom/carom-doc#8
						
						
						
						
						
						
						
						Calculate prize using normal and happy hour prize 
						
						
					 | 
					
						2017-02-25 20:02:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d16a473bf
					 | 
					
						
						
							
							carom/carom-doc#8
						
						
						
						
						
						
						
						Update location model for happy hour 
						
						
					 | 
					
						2017-02-25 18:34:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9df1ed5b79
					 | 
					
						
						
							
							reformat js block
						
						
						
						
						
						
					 | 
					
						2017-02-25 18:06:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab842b00ed
					 | 
					
						
						
							
							rebuild menue
						
						
						
						
						
						
					 | 
					
						2017-02-24 07:34:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e63120549c
					 | 
					
						
						
							
							carom/carom-doc#4
						
						
						
						
						
						
						
						fixes page reload on ie11 
						
						
					 | 
					
						2017-02-22 17:11:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						11ff3b02fd
					 | 
					
						
						
							
							add migration
						
						
						
						
						
						
					 | 
					
						2017-02-22 10:23:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58252c830b
					 | 
					
						
						
							
							reformat ajax logic only refresh desk area
						
						
						
						
						
						
					 | 
					
						2017-02-21 08:10:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Werner
							
						 
					 | 
					
						
						
							
						
						b100c15a82
					 | 
					
						
						
							
							Ajaxify views
						
						
						
						
						
						
					 | 
					
						2017-02-20 19:13:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61ff97a8b2
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2017-02-20 18:49:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b6185e6282
					 | 
					
						
						
							
							update requests
						
						
						
						
						
						
					 | 
					
						2017-02-20 09:04:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad46d883a0
					 | 
					
						
						
							
							show username
						
						
						
						
						
						
					 | 
					
						2017-02-17 19:08:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b46bd28ad6
					 | 
					
						
						
							
							modify ld processing
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:56:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ecb96f520
					 | 
					
						
						
							
							fix ld management
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:49:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cff748ccbe
					 | 
					
						
						
							
							link to admin page
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:38:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e16169c4ed
					 | 
					
						
						
							
							Only show Location-Selector if locations > 1
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:30:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97489af723
					 | 
					
						
						
							
							fix error in ceck data
						
						
						
						
						
						
					 | 
					
						2017-02-11 20:10:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a18080db9
					 | 
					
						
						
							
							define celery settings
						
						
						
						
						
						
					 | 
					
						2017-02-11 19:23:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e84b2f54a9
					 | 
					
						
						
							
							reenable request processor
						
						
						
						
						
						
					 | 
					
						2017-02-11 18:59:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b1c7675f0
					 | 
					
						
						
							
							check for duplicated desk_no
						
						
						
						
						
						
					 | 
					
						2017-02-11 18:36:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e74fc9d626
					 | 
					
						
						
							
							send emails while errors
						
						
						
						
						
						
					 | 
					
						2017-02-11 11:31:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a72e1f67d2
					 | 
					
						
						
							
							definition of email settings
						
						
						
						
						
						
					 | 
					
						2017-02-11 11:29:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4276ee76be
					 | 
					
						
						
							
							fix select
						
						
						
						
						
						
					 | 
					
						2017-02-11 11:00:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |