84 Commits

Author SHA1 Message Date
bernis
754d63ce4c fixed: example rc.local 2017-03-30 16:57:19 +02:00
bernis
370ad2a12e improvements in logging 2017-03-30 16:49:18 +02:00
bernis
df94dc792b increased button size in user list to mitigate bad digitizer problems 2017-03-06 22:49:30 +01:00
bernis
9c11485cb4 fix: bad programming in gui user list 2017-03-06 22:30:32 +01:00
bernis
e9381ceed1 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2017-03-06 21:13:31 +01:00
bernis
08d3e6b881 fix gui app and main loop in same thread 2017-03-06 21:12:24 +01:00
Ulrich Knechtelsdorfer
e75e66337e -fix: reverse order of consumptions 2017-03-06 20:12:22 +01:00
Ulrich Knechtelsdorfer
6bfbba20be -fix: error message when paying 2017-03-06 19:56:45 +01:00
Ulrich Knechtelsdorfer
21863502f8 - fix: bug in removing RFID IDs 2017-03-05 17:20:51 +01:00
Ulrich Knechtelsdorfer
5ec6dacd4b -add baron can change password of users 2017-03-04 09:13:02 +01:00
Ulrich Knechtelsdorfer
fca49a0176 - fix unwanted password change 2017-03-04 08:53:27 +01:00
bernis
0a50656350 add: posibility to show more than 4 drinks 2017-03-03 19:10:21 +01:00
bernis
4514db257f changed various html templates to include notification boxes, spelling 2017-03-03 17:48:25 +01:00
bernis
a36df6973e add: script to restart run.py and pigpiod, example rc.local 2017-03-03 16:51:19 +01:00
bernis
9a484fa85d fixed negative temperatures calculation 2017-02-10 17:51:58 +01:00
Ulrich Knechtelsdorfer
a96342c815 - forcing browser to refresh images via timestamp 2016-11-28 00:17:35 +01:00
Ulrich Knechtelsdorfer
8ae2683d71 - add email server login data to settings 2016-11-27 22:46:13 +01:00
Ulrich Knechtelsdorfer
e8392f83ad - add standard messages for email to settings 2016-11-27 21:10:06 +01:00
Ulrich Knechtelsdorfer
f83be6b578 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-07-09 10:50:14 +02:00
Ulrich Knechtelsdorfer
dc3cdfbc0b - add selfmanagement 2016-07-09 10:47:39 +02:00
Ulrich Knechtelsdorfer
690f7e8996 - fix edit user rfid bug 2016-07-09 09:11:17 +02:00
Bernhard Stampfer
0b49e1c7a7 Merge branch 'master' of https://github.com/ulrichknecht/baroness
Conflicts:
	app/plot.py
	app/views.py
2016-07-07 18:30:26 +02:00
Bernhard Stampfer
977e53e460 -change: minor stuff 2016-07-07 18:23:45 +02:00
Ulrich Knechtelsdorfer
f10c5f0911 - fix: dont import PIGPIO if datalogging is dissabled 2016-07-03 20:42:53 +02:00
Ulrich Knechtelsdorfer
47343601c9 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-07-03 20:32:19 +02:00
Ulrich Knechtelsdorfer
9f3ee93be9 - add only buy with rfid option 2016-07-01 17:03:23 +02:00
bernis
fcf5c14bde fix: bugs in plotting/logging 2016-06-18 19:38:35 +02:00
Bernhard Stampfer
672d8551a2 - updated case 2016-06-06 22:00:28 +02:00
Bernhard Stampfer
adbe4f858a fix: data logger now called from main, plot in thread 2016-06-05 23:00:25 +02:00
Ulrich Knechtelsdorfer
042d0c86fa - add: support for multible rfid tags 2016-05-28 17:10:07 +02:00
Bernhard Stampfer
33676b6c94 - new: 3d printable case 2016-05-26 16:10:42 +02:00
Bernhard Stampfer
ccb505c771 - fix: missing fridges template 2016-05-07 21:09:45 +02:00
Bernhard Stampfer
eff47b8c42 - removed ipdb from imports 2016-05-07 21:03:57 +02:00
Bernhard Stampfer
5e581293a6 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-05-07 20:52:09 +02:00
Bernhard Stampfer
54ce22c0c1 add: log messages woth python module 'logging' instead of print 2016-05-07 20:51:06 +02:00
Bernhard Stampfer
d124755c88 add: fridges view, fridge+sensor class, plot function, generator for test data 2016-05-07 20:48:31 +02:00
Bernhard Stampfer
fba306db5a fix: viewport for mobile devices, resizing of bierliste image for mobile view 2016-05-07 19:53:27 +02:00
Martin Mosbeck
3948404fc1 TODO updated with Berni & Minor fix in send_email.py 2016-05-07 18:08:02 +02:00
Bernhard Stampfer
2f4ddc84a5 fix: remember: always call wx stuff from wx main thread (with wx.CallAfter) 2016-04-17 21:01:39 +02:00
Bernhard Stampfer
99257f87ee - fix: bug in views(billing_personal) and plot (min width) 2016-04-10 20:44:20 +02:00
Bernhard Stampfer
0afba6bcd6 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-04-10 19:51:02 +02:00
Bernhard Stampfer
e80fdeec05 - some changes in the plot, removed todo messages in web if 2016-04-10 19:48:35 +02:00
Bernhard Stampfer
f55fa181ba - added RFID tag reading with the MFRC522 lib 2016-04-10 19:46:20 +02:00
Ulrich Knechtelsdorfer
65c51e2b71 - add autoblack 2016-04-08 20:23:47 +02:00
Ulrich Knechtelsdorfer
9cf32cc82a - add paying 2016-04-06 23:38:48 +02:00
Ulrich Knechtelsdorfer
10f6eea47a - fix: rename wx.Color to Colour because of new wx version 2016-04-06 22:47:40 +02:00
Ulrich Knechtelsdorfer
024d38bad6 merge email sending
Merge branch 'master' of https://github.com/ulrichknecht/baroness
2016-04-06 22:39:48 +02:00
Ulrich Knechtelsdorfer
0bd185482d - add sending of emails (works except dept) 2016-04-06 22:38:56 +02:00
Bernhard Stampfer
cd38d16430 - added: database: get_debt(name) and views for it 2016-03-26 21:09:17 +01:00
Bernhard Stampfer
8469f00884 - Gui: take settings from settings file, show pictures of drinks 2016-03-26 21:01:47 +01:00