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

• 25808f4c5a fix select accountings reinsle 2017-02-09 20:51:09 +01:00
• fd3d597712 add test client reinsle 2017-02-09 20:39:09 +01:00
• 8dac06a050 align text reinsle 2017-02-09 20:10:21 +01:00
• 3c500baf99 fix accounting reinsle 2017-02-06 21:34:42 +01:00
• 24a8099b83 fix queue management reinsle 2017-02-06 21:25:45 +01:00
• 528e4647f3 make migration reinsle 2017-02-06 20:32:37 +01:00
• 6c01986a89 error_msg -> textfield Alexander Werner 2017-02-06 20:29:35 +01:00
• 46c9cdb2d5 Merge branch 'develop' of git.einsle.de:carom/carom-server into develop Alexander Werner 2017-02-06 20:28:26 +01:00
• d0e5b90946 fixed typo in models Alexander Werner 2017-02-06 20:27:11 +01:00
• e66d729b62 add tzinfo for calculating reinsle 2017-02-06 20:11:20 +01:00
• dae777892b add locationdata process logic reinsle 2017-02-06 19:58:32 +01:00
• 3a48ac9c6b update celery call reinsle 2017-02-06 19:11:32 +01:00
• 288abf1ad0 add celery stuff reinsle 2017-02-06 18:50:10 +01:00
• 567d6007fe Added metadata to models Alexander Werner 2017-02-06 19:19:28 +01:00
• 5763890d5c update requirements file reinsle 2017-02-06 18:22:41 +01:00
• 10bec23d98 add django-crispy-forms to requirements reinsle 2017-02-06 18:17:03 +01:00
• aebcc9af76 cleanup reinsle 2017-02-05 19:20:48 +01:00
• ab9569a2b6 fix docstring reinsle 2017-02-05 17:18:37 +01:00
• e63f8b7562 Calculate prize of rental reinsle 2017-02-05 17:07:42 +01:00
• 858cb5ce8d add http refresh to 3 sec reinsle 2017-02-05 13:28:58 +01:00
• 802810fe0d add client info to accounting admin reinsle 2017-02-05 13:28:41 +01:00
• bf20e232d9 fix view logic while no location reinsle 2017-02-05 12:58:06 +01:00
• bede78cf84 fix toString reinsle 2017-02-04 12:39:28 +01:00
• 7d4886abe2 update view reinsle 2017-02-04 12:30:01 +01:00
• 1a2eb98d20 fix accounting model reinsle 2017-02-04 11:31:48 +01:00
• 02bb974a92 update accounting model reinsle 2017-02-04 11:18:35 +01:00
• 7776bc844c fix view logic reinsle 2017-02-04 07:35:17 +01:00
• db051986a2 update location model reinsle 2017-02-04 06:51:09 +01:00
• 7a7fbfb142 fix template matrix for login/logout reinsle 2017-02-04 06:37:02 +01:00
• 19719a68b9 add login function reinsle 2017-02-04 06:20:46 +01:00
• 47ba4b0b67 add login_required decorator reinsle 2017-02-03 09:42:23 +01:00
• a003fbcf19 update jquery reinsle 2017-02-02 21:17:04 +01:00
• 047a022f7e fix layout of presentation reinsle 2017-02-02 20:44:10 +01:00
• e0c090dad9 fix access to accounting data reinsle 2017-02-02 20:43:32 +01:00
• 16243def6d show accounting data from table reinsle 2017-02-01 20:25:33 +01:00
• 90974ea783 update view, show location info reinsle 2017-02-01 18:57:29 +01:00
• 48a912f04b update data model reinsle 2017-02-01 17:52:16 +01:00
• 616fd63bfc update data model reinsle 2017-02-01 13:51:15 +01:00
• 96dc601542 update django-extensions to 1.7.6 reinsle 2017-02-01 11:42:51 +01:00
• 16d181c8ce Merge branch 'develop' of git.wolke.einsle.de:carom/carom-server into develop reinsle 2017-01-27 09:37:31 +01:00
• e34d4a5a7b local changes reinsle 2017-01-27 09:37:23 +01:00
• be8e072675 create templates reinsle 2017-01-09 20:42:59 +01:00
• eaa7a210ce update base view using local jquery reinsle 2017-01-09 19:30:56 +01:00
• a78d3e3193 add jquery library reinsle 2017-01-09 19:23:44 +01:00
• c29e8fbef8 add authentication classes reinsle 2017-01-09 19:00:03 +01:00
• 99ecd5efc3 fix adminview reinsle 2017-01-09 18:40:48 +01:00
• aca77949b0 remove unused parameters reinsle 2017-01-09 18:40:36 +01:00
• 6610c3b48e Extend LD Model reinsle 2017-01-09 15:37:25 +01:00
• 5c21ec8699 update template reinsle 2017-01-09 14:13:07 +01:00
• 1d0da1eb27 add first template for location_data object reinsle 2017-01-09 10:59:46 +01:00
• d8df0dec1c add basic template reinsle 2017-01-09 10:27:02 +01:00
• 5f424770eb add bootstrap static files reinsle 2017-01-09 10:23:18 +01:00
• cb2b3cf9da add local settings import reinsle 2017-01-09 08:18:44 +01:00
• 7f98816235 update to python3 reinsle 2017-01-09 08:18:16 +01:00
• f1604f585d add static_root setting reinsle 2017-01-09 08:09:41 +01:00
• 0dff09e4e4 fix filemode of manage.py reinsle 2017-01-09 08:09:27 +01:00
• 23848eecdd add static file dir to gitignore reinsle 2017-01-09 08:09:04 +01:00
• 0f806c40b1 add local settings reinsle 2017-01-09 07:27:22 +01:00
• 7bfaefa41f fix location Data reinsle 2017-01-06 20:24:36 +01:00
• aa722fdc9c add locationdata to admin, fix location data model reinsle 2017-01-06 20:16:21 +01:00
• 48fd74c020 add all allowed hosts reinsle 2017-01-06 20:15:29 +01:00
• 136c1eb363 add migration reinsle 2017-01-06 19:15:52 +01:00
• ba29b0a351 updata location data sting reinsle 2017-01-06 19:15:12 +01:00
• ca721ed8b8 add location data object reinsle 2017-01-06 19:11:29 +01:00
• a33cacbe98 update views reinsle 2017-01-06 18:59:58 +01:00
• df7ad948c1 update serializers reinsle 2017-01-06 18:59:05 +01:00
• b3445879fd update .gitignore reinsle 2017-01-06 18:55:30 +01:00
• e1c94100fb update models reinsle 2017-01-06 18:53:26 +01:00
• 83e77ec81c add requirements file reinsle 2017-01-06 18:52:47 +01:00
• e83c230c8c update file mode reinsle 2017-01-06 18:41:38 +01:00
• a782d79c29 remove idea filder reinsle 2017-01-06 18:40:40 +01:00
• e171f14af7 fix git ignore file reinsle 2017-01-06 18:39:10 +01:00
• 94df28530e Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop reinsle 2017-01-03 20:15:06 +01:00
• aa27510b84 fix lines reinsle 2017-01-03 20:13:47 +01:00
• 363fb584f6 Updated rest data Alexander Werner 2017-01-03 19:55:01 +01:00
• ded2d189bb fix list_display reinsle 2017-01-03 19:50:06 +01:00
• 422287ad11 add sqlite to gitignore reinsle 2017-01-03 19:48:24 +01:00
• 8cbf4e9e78 add admin decorators reinsle 2017-01-03 19:48:00 +01:00
• 7e875101c9 add admin page reinsle 2017-01-03 19:40:35 +01:00
• 38cd810017 settings update Alexander Werner 2017-01-03 19:32:53 +01:00
• bb519cb96f Initial migration Alexander Werner 2017-01-03 19:29:13 +01:00
• a51c2cf733 Added billard app Alexander Werner 2017-01-03 19:26:51 +01:00
• c297407135 Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop reinsle 2017-01-03 19:12:23 +01:00
• d4a8298725 Updated settings, urls, restframework Alexander Werner 2017-01-03 19:11:21 +01:00
• ff9795327a Merge branch 'develop' of ssh://git.einsle.de:5000/carom/carom-server into develop reinsle 2017-01-03 19:11:02 +01:00
• 6756e73bc8 add .gitignore reinsle 2017-01-03 19:02:23 +01:00
• 6d90f874ad Started django app Alexander Werner 2017-01-03 18:57:11 +01:00
• 661c7b67a0 Add readme.rstC reinsle 2017-01-03 18:46:44 +01:00