Commit Graph

34 Commits

Author SHA1 Message Date
52d515b05e update requirements 2017-04-26 10:06:25 +02:00
Alexander Werner
0a6704b191 updated accounting view permission 2017-04-10 20:30:27 +02:00
Alexander Werner
95967c5f05 Fix in accountmodal 2017-03-27 21:14:17 +02:00
522411ea34 update accounting 2017-03-11 20:49:14 +01:00
ab6d1fa07e add dialog to show accounting data 2017-03-11 20:39:11 +01:00
29ef5ac541 Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
#	billard/models.py
#	billard/views.py
2017-03-09 20:52:34 +01:00
201c347fcc Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
#	billard/models.py
#	billard/views.py
2017-03-09 20:52:12 +01:00
6c5c77b597 fix circular dependencie 2017-03-09 20:32:49 +01:00
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
e7a25888a7 updated modal code 2017-03-06 20:05:53 +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
3a2c21cbc2 Added modal view 2017-03-02 20:25:40 +01:00
f9c483c8d3 fix error in view.py 2017-02-26 12:20:50 +01:00
Alexander Werner
b100c15a82 Ajaxify views 2017-02-20 19:13:03 +01:00
e84b2f54a9 reenable request processor 2017-02-11 18:59:42 +01:00
3a49658f21 modify accounting model 2017-02-11 10:34:30 +01:00
55cdfc0509 update template using new desk model 2017-02-10 19:53:11 +01:00
bf20e232d9 fix view logic while no location 2017-02-05 12:58:06 +01:00
7776bc844c fix view logic 2017-02-04 11:13:39 +01:00
47ba4b0b67 add login_required decorator 2017-02-03 09:42:23 +01:00
90974ea783 update view, show location info 2017-02-01 18:57:29 +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
1d0da1eb27 add first template for location_data object 2017-01-09 10:59:46 +01:00
7bfaefa41f fix location Data 2017-01-06 20:24:36 +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
Alexander Werner
363fb584f6 Updated rest data 2017-01-03 19:55:12 +01:00
Alexander Werner
a51c2cf733 Added billard app 2017-01-03 19:27:04 +01:00