Commit Graph

16 Commits

Author SHA1 Message Date
Jan Tuomi 31e324e478 Remove obsolete setting in base.py 2017-11-02 23:20:57 +02:00
Jan Tuomi 29070165eb Merge develop to feature-excel-import-export 2017-11-02 15:15:41 +02:00
Jan Tuomi 755abe5647 Add missing pip dependency 2017-11-01 13:17:31 +02:00
Jan Tuomi 2f80159144 Merge branch 'feature-coffee-upgrade' into 'develop'
Feature coffee upgrade

See merge request vtmk/web2.0!92
2017-11-01 13:14:44 +02:00
Jan Tuomi e709570f22 Change stuff to use excel files 2017-10-31 22:36:31 +02:00
Aarni Halinen b779ecaf14 Add password recovery tool
All templates overridden for easier custom texts. Login_base.html for recovery and login pages
2017-10-31 20:15:02 +02:00
okalintu 8f74c87df5 Reimplement serverside coffee scale 2017-10-29 23:46:20 +02:00
Jan Tuomi 3b3b45b5ee Move MQTT and HSL startup scripts around 2017-10-26 08:35:48 +03:00
Jan Tuomi a7732e136d Add language middleware 2017-10-17 12:44:49 +03:00
Jan Tuomi 4099e5fa24 Fix broken tests 2017-09-29 00:05:17 +03:00
Jan Tuomi 8f06190bd0 Use django-suit for SIK Admin 2017-09-28 23:36:12 +03:00
Jan Tuomi 61f5c293db Implement token auth for sähköpiikki 2017-09-26 14:39:21 +03:00
Jan Tuomi 864b3787c8 Add sahkopiikki user create command 2017-09-26 11:30:34 +03:00
Jan Tuomi 7ce28c3a48 Add autocomplete widget and fix some errors 2017-09-25 20:45:13 +03:00
Jan Tuomi 010fab5be1 Move static dir and fix eslint issues 2017-09-24 16:21:45 +03:00
Jan Tuomi ef58c8c98f Split settings.py into 2 2017-09-24 13:42:27 +03:00