Commit Graph

288 Commits

Author SHA1 Message Date
ae845c5fd2 Update gitignore 2018-02-10 11:52:50 +01:00
5b4d840ebe Update requirements 2018-02-10 11:52:37 +01:00
d31793afbd Update to bootstrap 4 2018-02-10 11:04:29 +01:00
f18522636d Update requirements 2018-02-10 11:04:05 +01:00
59a427d22f Update bootstrap to 4.0 2018-02-10 11:01:49 +01:00
bc097764e9 redirect / to /billard 2017-09-20 11:24:25 +02:00
0f933aa681 Merge branch 'release/0.2.3' into develop 2017-08-18 10:45:07 +02:00
2362c5d53e Merge branch 'release/0.2.3'
# Conflicts:
#	billard/templates/billard/base.html
2017-08-18 10:44:35 +02:00
acaa9441a5 set version information 2017-08-18 10:43:02 +02:00
e674b95d40 set version information 2017-08-18 10:41:55 +02:00
2acd2fb952 Merge branch 'release/0.2.2' 2017-08-18 10:41:31 +02:00
a4e999ac52 set version information 2017-08-18 10:41:15 +02:00
Alexander Werner
899ddb24e5 accountmodal table style 2017-08-17 20:23:14 +02:00
Alexander Werner
33cd50a2c6 accountmodal typography 2017-08-17 20:19:20 +02:00
Alexander Werner
d115a58600 Fixed urls parsing for accountmodal 2017-08-17 20:16:25 +02:00
Alexander Werner
6c58878646 Fixed typeerror in accountmodal 2017-08-17 20:12:22 +02:00
Alexander Werner
9f04b7b557 Show multiple accounts in accountmodal 2017-08-17 20:09:45 +02:00
e5d9d61211 messages fixed 2017-08-04 19:41:44 +02:00
e16872effe add error logging while processing location data 2017-08-04 19:31:46 +02:00
091723d2ac changes to make ie8 ready 2017-08-04 19:22:46 +02:00
79233c408e remove celery from project 2017-08-04 17:49:33 +02:00
81d9b7f29c add command to process location data 2017-08-03 19:52:43 +02:00
222367a6a2 update requirements 2017-08-03 19:10:15 +02:00
bb30dd73eb Merge tag '0.2.1' into develop
Tagging version 0.2.1 0.2.1
2017-08-01 07:57:19 +02:00
73fe29b4a4 Merge branch 'release/0.2.1' 2017-08-01 07:57:19 +02:00
dd28964bf9 set version info 2017-08-01 07:57:00 +02:00
294b189a92 add order by 2017-08-01 07:48:55 +02:00
9dd2d30dcf disable cmd sceduler 2017-08-01 07:48:55 +02:00
dd85fcb6ea update requirements 2017-06-21 20:59:04 +02:00
bc89db6179 carom/carom-doc#13
fix access accounting objects
2017-05-17 09:57:56 +02:00
50823e5688 do multiple update at once 2017-04-29 11:38:52 +02:00
9fb04c661d set add info for reinsle 2017-04-29 11:34:18 +02:00
eb5168a1bd set version info 2017-04-29 11:24:57 +02:00
68003388b7 Merge branch 'release/0.2.0' 2017-04-29 11:24:28 +02:00
d759bbae9d Merge branch 'release/0.2.0' into develop 2017-04-29 11:24:28 +02:00
b0b848c1a6 set release 2017-04-29 11:24:09 +02:00
673092407b add accounting tst 2017-04-29 11:15:26 +02:00
6492c29e32 extend list filter for location 2017-04-29 11:06:14 +02:00
865e8bb09a redesign location index page 2017-04-28 12:22:43 +02:00
5647e23e12 realign search filter 2017-04-28 07:17:56 +02:00
54e1beb177 add search filter to accounting 2017-04-28 07:11:58 +02:00
e1e5fdd6f5 fix login and logout urls 2017-04-27 14:35:04 +02:00
f1404e0c0f apply new version info 2017-04-27 14:29:30 +02:00
279d643758 rewrite url scemata 2017-04-27 14:22:23 +02:00
b345c9dfaf Merge branch 'feature/use_generic_views' into develop 2017-04-27 14:05:21 +02:00
a165a0560f cleanup code 2017-04-27 14:04:56 +02:00
e71f125b5d Merge branch 'feature/use_generic_views' of ssh://git.einsle.de:5000/carom/carom-server into feature/use_generic_views 2017-04-27 14:04:06 +02:00
857af8d54d cleanup code 2017-04-27 14:03:57 +02:00
3611839664 cleanup code 2017-04-27 13:59:36 +02:00
f0ed2a5195 fix code for accounting modal view 2017-04-27 13:56:18 +02:00