Commit Graph

Select branches

Hide Pull Requests

develop

master

0.1.0

0.1.1

0.2.0

0.2.1

0.2.2

0.2.3

0.5.0

0.5.1

1.0.0

1.0.1

v1.0.2

v1.0.3

v1.0.4

v1.0.5

Mono Color

• 7ad3a3e22d fix code for accounting confirm reinsle 2017-04-27 13:23:18 +02:00
• cae1ee197e update accounting dialog reinsle 2017-04-27 12:24:38 +02:00
• 5477a26cbb rebuild location index and detail view reinsle 2017-04-27 10:35:10 +02:00
• 9186ed2083 update initial migration add dependencie to session reinsle 2017-04-27 09:01:54 +02:00
• dc09be5a43 move code to use generic views reinsle 2017-04-27 08:04:44 +02:00
• b04e642daa update views reinsle 2017-04-26 10:36:31 +02:00
• 867788cd59 update accounting model reinsle 2017-04-26 10:17:19 +02:00
• 55cf6101a8 update accounting model reinsle 2017-04-26 10:14:49 +02:00
• 6135c7c61a add accounting user to admin view reinsle 2017-04-26 10:10:07 +02:00
• 52d515b05e update requirements reinsle 2017-04-26 10:06:25 +02:00
• c7efbffc8f update version info reinsle 2017-04-12 13:35:18 +02:00
• a1f8599b34 Merge tag '0.1.1' into develop Robert Einsle 2017-04-12 13:22:04 +02:00
• 69a58ad9a3 Merge branch 'release/0.1.1' 0.1.1 Robert Einsle 2017-04-12 13:21:55 +02:00
• 98f105296b store reporter uuid while saving accounting reinsle 2017-04-10 20:59:16 +02:00
• 0a6704b191 updated accounting view permission Alexander Werner 2017-04-10 20:30:27 +02:00
• 0f324b8a17 Update permissions and groups Alexander Werner 2017-04-10 19:38:49 +02:00
• 45db242c8e update requirements 0.1.0 reinsle 2017-04-08 19:06:39 +02:00
• 95967c5f05 Fix in accountmodal Alexander Werner 2017-03-27 21:14:17 +02:00
• 46f0c3a88b Added get prize testcases and fixed prize calculation Alexander Werner 2017-03-27 21:01:43 +02:00
• 9a84532042 Merge branch 'feature/#11_accounting_dialog' into develop reinsle 2017-03-12 19:23:59 +01:00
• 522411ea34 update accounting reinsle 2017-03-11 20:48:59 +01:00
• ab6d1fa07e add dialog to show accounting data reinsle 2017-03-11 20:20:25 +01:00
• 4669416a78 cleanup reinsle 2017-03-10 20:00:07 +01:00
• dd1be9fe50 merge migrations reinsle 2017-03-10 19:54:35 +01:00
• e3a34fe84a fix error in calculation price reinsle 2017-03-10 19:54:15 +01:00
• 57cf9553a2 fix error reinsle 2017-03-10 19:48:58 +01:00
• 594fbe76c2 update django rest framework reinsle 2017-03-10 19:34:21 +01:00
• 29ef5ac541 Merge branch 'feature/#3_accounting_dialog' into develop reinsle 2017-03-09 20:52:34 +01:00
• 201c347fcc Merge branch 'feature/#3_accounting_dialog' into develop reinsle 2017-03-09 20:52:12 +01:00
• 81f0da2b63 Merge branch 'feature/#4_celery' into develop reinsle 2017-03-09 20:33:02 +01:00
• 6c5c77b597 fix circular dependencie reinsle 2017-03-09 20:32:49 +01:00
• 3141944ff3 updated code for shared_tasks Alexander Werner 2017-03-09 20:26:03 +01:00
• 24b9743ce8 fix details on accounting dialog reinsle 2017-03-09 20:12:25 +01:00
• d2932d834a updated code for shared_tasks Alexander Werner 2017-03-09 20:08:35 +01:00
• f6d7d858ed Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog Alexander Werner 2017-03-09 19:50:50 +01:00
• a968e59cf1 fixed error if report_user not set Alexander Werner 2017-03-09 19:50:39 +01:00
• e81c5ca9ab update django-extensions reinsle 2017-03-08 19:15:48 +01:00
• bd48677953 updated modal code Alexander Werner 2017-03-06 20:13:22 +01:00
• 61a5c3ee04 updated modal code Alexander Werner 2017-03-06 20:11:07 +01:00
• e7a25888a7 updated modal code Alexander Werner 2017-03-06 20:05:53 +01:00
• 51a5d1659a updated modal code Alexander Werner 2017-03-06 19:48:59 +01:00
• 323ab5ae98 updated modal code Alexander Werner 2017-03-06 19:44:36 +01:00
• 8e95ae4ff5 updated modal code Alexander Werner 2017-03-06 19:31:35 +01:00
• d2e56b99b8 updated modal code Alexander Werner 2017-03-06 19:22:01 +01:00
• 716cb2d347 updated modal code Alexander Werner 2017-03-06 19:04:47 +01:00
• 1a7cce0934 Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog Alexander Werner 2017-03-06 19:03:39 +01:00
• 13fa332679 updated modal code Alexander Werner 2017-03-06 19:03:09 +01:00
• 8367f002c3 move to explicit imports reinsle 2017-03-06 18:54:03 +01:00
• 63e9c348a0 updated modal code Alexander Werner 2017-03-06 18:43:17 +01:00
• f89306dfde updating admin reinsle 2017-03-02 21:01:07 +01:00
• 943ff5ad21 update model reinsle 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 reinsle 2017-03-02 20:54:57 +01:00
• 4df4a095cb update calculating prize for accounting reinsle 2017-03-02 20:51:43 +01:00
• 3a2c21cbc2 Added modal view Alexander Werner 2017-03-02 20:25:40 +01:00
• 778078e86d update accounting model for bigger decimal reinsle 2017-03-02 16:11:11 +01:00
• d4a68683fa update accounting using location data uuid reinsle 2017-02-27 08:01:58 +01:00
• 0a36d3904e extend accounting model reinsle 2017-02-27 07:58:06 +01:00
• 1323976521 fix error in model reinsle 2017-02-26 12:37:47 +01:00
• 2eb8802e83 show version info in menu not in footer reinsle 2017-02-26 12:28:38 +01:00
• f9c483c8d3 fix error in view.py reinsle 2017-02-26 12:20:50 +01:00
• e22a153201 fix processingo of ld objects reinsle 2017-02-26 12:03:18 +01:00
• eab72df9ac fix error calculating prize reinsle 2017-02-26 11:24:46 +01:00
• ce9e54f21d carom/carom-doc#6 Anzeige des Preises pro Tisch reinsle 2017-02-26 10:34:36 +01:00
• 9ed10884e2 carom/carom-doc#6 Anzeige des PReises pro Tisch reinsle 2017-02-26 10:32:38 +01:00
• 2e6cc938aa add version info in footer reinsle 2017-02-25 20:30:08 +01:00
• fa00563195 carom/carom-doc#8 Calculate prize using normal and happy hour prize reinsle 2017-02-25 20:02:48 +01:00
• 6d16a473bf carom/carom-doc#8 Update location model for happy hour reinsle 2017-02-25 18:34:28 +01:00
• 9df1ed5b79 reformat js block reinsle 2017-02-25 18:06:27 +01:00
• ab842b00ed rebuild menue reinsle 2017-02-24 07:34:00 +01:00
• e63120549c carom/carom-doc#4 fixes page reload on ie11 reinsle 2017-02-22 17:11:39 +01:00
• 11ff3b02fd add migration reinsle 2017-02-22 10:23:57 +01:00
• 58252c830b reformat ajax logic only refresh desk area reinsle 2017-02-21 08:10:00 +01:00
• b100c15a82 Ajaxify views Alexander Werner 2017-02-20 19:11:48 +01:00
• 61ff97a8b2 fix typo reinsle 2017-02-20 18:49:55 +01:00
• b6185e6282 update requests reinsle 2017-02-20 09:04:14 +01:00
• ad46d883a0 show username reinsle 2017-02-17 19:08:43 +01:00
• b46bd28ad6 modify ld processing reinsle 2017-02-17 18:56:40 +01:00
• 1ecb96f520 fix ld management reinsle 2017-02-17 18:49:19 +01:00
• cff748ccbe link to admin page reinsle 2017-02-17 18:38:47 +01:00
• e16169c4ed Only show Location-Selector if locations > 1 reinsle 2017-02-17 18:30:28 +01:00
• 97489af723 fix error in ceck data reinsle 2017-02-11 20:10:24 +01:00
• 9a18080db9 define celery settings reinsle 2017-02-11 19:23:59 +01:00
• e84b2f54a9 reenable request processor reinsle 2017-02-11 18:59:42 +01:00
• 0b1c7675f0 check for duplicated desk_no reinsle 2017-02-11 18:36:32 +01:00
• e74fc9d626 send emails while errors reinsle 2017-02-11 11:31:27 +01:00
• a72e1f67d2 definition of email settings reinsle 2017-02-11 11:29:07 +01:00
• 4276ee76be fix select reinsle 2017-02-11 11:00:14 +01:00
• 2f14ecce7e clean up code reinsle 2017-02-11 10:53:46 +01:00
• 0f6805ea4e clean up code reinsle 2017-02-11 10:36:38 +01:00
• 3a49658f21 modify accounting model reinsle 2017-02-11 10:32:24 +01:00
• a8b9e7e61e modify accounting model reinsle 2017-02-11 10:23:03 +01:00
• 9f6477e5f1 rename field reinsle 2017-02-10 21:23:14 +01:00
• 4da0e85108 Merge branch 'feature/rebuild_model' into develop reinsle 2017-02-10 21:20:38 +01:00
• 31772f2f4a update mode reinsle 2017-02-10 21:19:53 +01:00
• c8c25714f0 update tasks reinsle 2017-02-10 21:02:07 +01:00
• 263bff6540 rename table_no to desk_no reinsle 2017-02-10 20:49:38 +01:00
• d516d830b6 usage of timezone reinsle 2017-02-10 20:35:19 +01:00
• 93028156b7 rename table_no to desk_no reinsle 2017-02-10 19:55:31 +01:00
• 55cdfc0509 update template using new desk model reinsle 2017-02-10 19:39:21 +01:00
• 7b76fdc62c rebuild database structure, do single desk models reinsle 2017-02-10 18:37:36 +01:00