Commit Graph

172 Commits

Author SHA1 Message Date
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
2f14ecce7e clean up code 2017-02-11 10:53:46 +01:00
0f6805ea4e clean up code 2017-02-11 10:36:38 +01:00
3a49658f21 modify accounting model 2017-02-11 10:34:30 +01:00
a8b9e7e61e modify accounting model 2017-02-11 10:23:03 +01:00
9f6477e5f1 rename field 2017-02-10 21:23:14 +01:00
4da0e85108 Merge branch 'feature/rebuild_model' into develop 2017-02-10 21:20:38 +01:00
31772f2f4a update mode 2017-02-10 21:19:53 +01:00
c8c25714f0 update tasks 2017-02-10 21:18:12 +01:00
263bff6540 rename table_no to desk_no 2017-02-10 20:49:38 +01:00
d516d830b6 usage of timezone 2017-02-10 20:35:19 +01:00
93028156b7 rename table_no to desk_no 2017-02-10 19:55:50 +01:00
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
fd3d597712 add test client 2017-02-09 20:39:30 +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
5763890d5c update requirements file 2017-02-06 18:22:41 +01:00
10bec23d98 add django-crispy-forms to requirements 2017-02-06 18:17:03 +01:00