 Jan Tuomi
|
524c6bbb9e
|
Merge branch 'develop' into 'master'
Fix for NaN message when coffee is brewing
See merge request !49
|
2017-09-25 12:21:19 +03:00 |
|
|
Teemu Mikkonen
|
42d51ca8ca
|
Fix for NaN message when coffee is brewing
|
2017-09-25 12:03:22 +03:00 |
|
|
Jan Tuomi
|
ac4902f867
|
Merge branch 'develop' into 'master'
Develop
See merge request !48
|
2017-09-24 16:31:08 +03:00 |
|
|
Jan Tuomi
|
010fab5be1
|
Move static dir and fix eslint issues
|
2017-09-24 16:21:45 +03:00 |
|
|
Jan Tuomi
|
dd69a0c395
|
Split coffee.html to multiple files
|
2017-09-24 15:46:43 +03:00 |
|
|
Jan Tuomi
|
78bfa9fbcb
|
Add ALLOWED_HOSTS to sample settings
|
2017-09-24 15:28:22 +03:00 |
|
|
Jan Tuomi
|
416be8e2cd
|
Merge branch 'develop' into 'master'
Develop
See merge request !47
|
2017-09-24 15:05:46 +03:00 |
|
|
Jan Tuomi
|
ef58c8c98f
|
Split settings.py into 2
|
2017-09-24 13:42:27 +03:00 |
|
|
Jan Tuomi
|
518ea5bf7d
|
Add exception handling
|
2017-09-24 13:31:19 +03:00 |
|
|
Jan Tuomi
|
a11943aec6
|
Move MQTT settings to settings.py
|
2017-09-24 13:28:38 +03:00 |
|
|
Jan Tuomi
|
8b98dcf1ce
|
Delegate a bunch of logic to the ESP
|
2017-09-24 13:16:46 +03:00 |
|
|
Jan Tuomi
|
1c4be69964
|
Add pickle serializer to settings sample
|
2017-09-24 12:42:16 +03:00 |
|
|
Jan Tuomi
|
4cee5582da
|
Merge branch 'develop' into 'master'
Develop
See merge request !46
|
2017-09-20 23:47:25 +03:00 |
|
|
Jan Tuomi
|
e5ca83a794
|
Merge branch 'feature-pep8-fixes' into 'develop'
Feature pep8 fixes
See merge request !45
|
2017-09-20 23:36:04 +03:00 |
|
|
Jan Tuomi
|
a99544f967
|
Fix more pep8 badlings
|
2017-09-20 23:35:41 +03:00 |
|
|
Jan Tuomi
|
68f587f776
|
Merge branch 'develop' into feature-pep8-fixes
|
2017-09-20 23:32:41 +03:00 |
|
|
Jan Tuomi
|
0b779c4799
|
Fix pep8 errors
|
2017-09-20 23:27:09 +03:00 |
|
|
Jan Tuomi
|
5d1238c23d
|
Change prints to logs
|
2017-09-20 23:19:50 +03:00 |
|
|
Jan Tuomi
|
b0edaae32e
|
Remove conflict resolver and add dynamic payments
|
2017-09-20 23:19:50 +03:00 |
|
|
henu
|
df4f1a8f56
|
Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-pep8-fixes
|
2017-09-20 21:16:47 +03:00 |
|
|
henu
|
43e54af141
|
Fix webapp and sikweb py files pep8
|
2017-09-20 21:15:46 +03:00 |
|
|
henu
|
08710b3705
|
Fix members pep8 and add docstrings
|
2017-09-20 21:00:58 +03:00 |
|
|
henu
|
ecc0ac965e
|
Fix infoscreen pep8 and add docstrings
|
2017-09-20 20:08:26 +03:00 |
|
|
Aarni
|
7a435bcbc6
|
Simple Ohlhafv challenge machine
|
2017-09-20 19:28:05 +03:00 |
|
|
Henri Varjotie
|
f738e76726
|
Merge branch 'feature-header-template' into 'develop'
Feature header template
See merge request !44
|
2017-09-20 19:11:53 +03:00 |
|
|
henu
|
e294707aed
|
Increase logo width to 100%
|
2017-09-20 18:52:57 +03:00 |
|
|
henu
|
593b380ecf
|
Add link to header img
|
2017-09-20 18:52:36 +03:00 |
|
|
henu
|
c811b65280
|
Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-header-template
|
2017-09-20 18:44:41 +03:00 |
|
|
henu
|
ec5c206c8e
|
Include header to base html file
|
2017-09-20 18:44:03 +03:00 |
|
|
henu
|
3b6f2988df
|
Add logo to header
|
2017-09-20 18:43:34 +03:00 |
|
|
henu
|
33215343ec
|
Add header logo and header css files
|
2017-09-20 18:42:56 +03:00 |
|
|
Aarni
|
e18f28ab7f
|
Migration file for max_length change
|
2017-09-20 18:09:09 +03:00 |
|
|
Aarni
|
5e4a41d52a
|
Unite some CharField max_lengths
|
2017-09-20 18:06:01 +03:00 |
|
|
Aarni
|
f006c6ceef
|
Fix JSONField and add migration files
|
2017-09-20 18:01:44 +03:00 |
|
|
henu
|
c0e8ba21ee
|
Create header template file
|
2017-09-20 17:50:57 +03:00 |
|
|
Aarni
|
62be06ea6e
|
Remove copypasta verbose_name
|
2017-09-20 17:46:05 +03:00 |
|
|
Aarni
|
68b37dea91
|
Registration model
|
2017-09-20 17:46:04 +03:00 |
|
|
Aarni
|
064b07e75a
|
Ohlhafv model
|
2017-09-20 17:46:04 +03:00 |
|
|
Jan Tuomi
|
160f5adc59
|
Merge branch 'develop' into 'master'
Add filtering to coffee data
See merge request !43
|
2017-09-19 21:05:07 +03:00 |
|
|
Jan Tuomi
|
7570d0c131
|
Add filtering to coffee data
|
2017-09-19 21:04:48 +03:00 |
|
|
Jan Tuomi
|
b8267e411c
|
Merge branch 'develop' into 'master'
Fix logging in all modules
See merge request !42
|
2017-09-19 19:32:06 +03:00 |
|
|
Jan Tuomi
|
f534244dd8
|
Fix logging in all modules
|
2017-09-19 19:31:43 +03:00 |
|
|
Jan Tuomi
|
ab2fcf04eb
|
Merge branch 'develop' into 'master'
Attempt to hotfix coffee scale crash
See merge request !41
|
2017-09-19 17:02:36 +03:00 |
|
|
Jan Tuomi
|
b507bc5f27
|
Attempt to hotfix coffee scale crash
|
2017-09-19 17:01:56 +03:00 |
|
|
Jan Tuomi
|
4a79ed341e
|
Merge branch 'develop' into 'master'
Develop
See merge request !40
|
2017-09-19 00:06:29 +03:00 |
|
|
Jan Tuomi
|
a63504619a
|
Add weird fix to MQTT module
|
2017-09-19 00:05:58 +03:00 |
|
|
Jan Tuomi
|
d4d63ac99d
|
Call fetch when opening coffee scale page
|
2017-09-18 23:59:49 +03:00 |
|
|
Jan Tuomi
|
a813b502fc
|
Random coffee scale fixes
|
2017-09-18 23:58:45 +03:00 |
|
|
Jan Tuomi
|
7b8c5f3d8f
|
Merge branch 'develop' into 'master'
Move coffee scale to web2.0
See merge request !39
|
2017-09-18 23:17:11 +03:00 |
|
|
Jan Tuomi
|
5da4b52bde
|
Move coffee scale to web2.0
|
2017-09-18 23:16:19 +03:00 |
|