Commit Graph

f07a2bd Further git test code by Manuel83 2017-10-13 21:54:20 +0200
a265d3a Clean up print statements by Manuel83 2017-10-13 21:50:07 +0200
52bb994 replaced the remaining print statements with calls to logger by Johannes 2017-10-13 06:19:06 +0200
b3145fa - Added RotatingFileHandler to log configuration. - switched most occurrences of "print" to "logger" by Johannes 2017-10-12 07:29:45 +0200
211edc1 (refs/pull/133/head) Added a combinaton of stop-del logfiles-start by JamFfm 2017-10-01 14:11:52 +0200
b56c10a (refs/pull/105/head) Merge branch 'master' into patch2 by swimIan 2017-09-29 13:43:51 -0700
8d2c5c9 Updated again by swimIan 2017-09-29 13:40:55 -0700
d637c08 update to reflect changes in the master branch by swimIan 2017-09-29 13:12:03 -0700
0447621 Merge pull request #10 from Manuel83/master by swimIan 2017-09-28 21:44:17 -0700
7779d00 Merge pull request #132 from carlallen/restore_port_for_31 by Manuel83 2017-09-28 17:34:50 +0200
d9e79d0 Change to Pritt print Cache by Manuel83 2017-09-28 07:40:06 +0200
707a576 (refs/pull/132/head) Restore port config for 3.1 by Carl Allen 2017-09-27 15:15:19 -0500
547804b -Custom Web View Examples Added -UI Adjustment for small screens. Brew Steps are displayed above the kettles. - by Manuel83 2017-09-27 20:13:36 +0200
0339564 Merge pull request #130 from bertah/master by Manuel83 2017-09-25 13:22:46 +0200
813b2f0 - Login Added. Default Password is „beer“ - Several UI Adjustments - still work in progress - New API Method to add custom JavaScript to CraftBeerPi - Global Action Buttons added - Register new Web Modules for complete custom UI by Manuel83 2017-09-24 15:10:45 +0200
65833b1 (refs/pull/130/head) GPIOPWM: Fixed misleading label "duty cycle" to "frequency", and handle decimal frequency values. Tested working with Rpi.GPIO by bertah 2017-09-23 10:03:48 -0400
25ace80 Merge pull request #127 from mrillies/patch-1 by Manuel83 2017-09-22 13:55:10 +0200
820061c - Two new hop steps added. Now you can set 5 hop alerts by Manuel83 2017-09-22 13:52:00 +0200
c1c5faa (refs/pull/127/head) Add reset to post put call (Fermenter update) by mrillies 2017-09-22 21:41:19 +1000
8d7cf3f (refs/pull/93/merge) Merge 59b59540c8 into 837b906af1 by flo269 2017-09-20 22:08:56 +0000
42ed9f0 First Refactoring by Manuel83 2017-09-21 00:03:33 +0200
837b906 Merge pull request #126 from mrillies/patch-1 by Manuel83 2017-09-20 23:41:43 +0200
0f42153 (refs/pull/126/head) Update controller.py by mrillies 2017-09-21 02:14:56 +1000
5fc5684 update boilstep and reorder steps in beerxml recipe import by swimIan 2017-09-09 10:51:37 -0700
dc90826 Merge pull request #9 from swimIan/master by swimIan 2017-09-06 06:10:43 -0700
14e4e6d Merge pull request #8 from Manuel83/master by swimIan 2017-09-06 06:08:22 -0700
bf3fbdd Merge pull request #119 from carlallen/text_property_default_value_fix by Manuel83 2017-09-05 08:03:24 +0200
15515e1 (refs/pull/120/merge) Merge 899af8bfa1 into d3bc54001f by mrillies 2017-09-05 02:22:37 +0000
899af8b (refs/pull/120/head) Update props.py by mrillies 2017-09-05 12:21:50 +1000
590ef4c (refs/pull/119/head) set default_value for Text Property by Carl Allen 2017-09-04 21:16:23 -0500
d3bc540 Merge pull request #101 from carlallen/default_value_for_numbers by Manuel83 2017-09-04 16:34:53 +0200
25dead2 Merge pull request #115 from cow77/patch-3 by Manuel83 2017-09-04 16:34:25 +0200
f771289 Loading all plugins before calling initializer methods. Now also initializer which are defined in the plugin will be called. Before these initializer where ignored. by Manuel83 2017-08-31 18:42:02 +0200
bf02c08 (refs/pull/115/head) Update __init__.py by Co de Waal 2017-08-29 11:11:20 +0200
c765589 Chart boost added by Manuel83 2017-08-15 22:10:59 +0200
ae7e3a2 Adjust check_hop_timer function to alert the user to add the hops at the expected values in the boil process (ex. 60= bittering, 20=aroma, etc), instead of the reverse (ex. 0=bittering, 40=aroma, etc). by swimIan 2017-08-08 23:36:18 -0700
3eee952 Add mashinstep, import mashin temp(infuse_temp) from beerxml, and put boil step ahead of whirlpool and chill steps. by swimIan 2017-08-08 22:48:23 -0700
88b360a Merge pull request #7 from Manuel83/master by swimIan 2017-07-29 07:13:20 -0700
f62f9ba (refs/pull/101/head) Add default to text property for @IndyJoeA by Carl Allen 2017-07-28 09:32:15 -0500
909a6aa Add default values for Property.Number by Carl Allen 2017-07-26 18:14:04 -0500
59b5954 (refs/pull/93/head) Merge remote-tracking branch 'Manuel83/master' by flo269 2017-07-25 14:03:27 +0200
40b7253 - Add On - Link to Plugin Website - CSS Fix for Safari by Manuel83 2017-07-24 21:27:39 +0200
9d41e61 (refs/pull/99/head) Add files via upload by cocothenut 2017-07-22 17:22:43 +0200
213e15d Add files via upload by cocothenut 2017-07-22 17:22:22 +0200
7394873 Add files via upload by cocothenut 2017-07-22 17:21:51 +0200
3761713 Merge pull request #6 from swimIan/patch2 by swimIan 2017-07-22 07:55:19 -0700
a96c678 Merge pull request #5 from swimIan/master by swimIan 2017-07-22 07:53:16 -0700
e7765a2 Merge pull request #4 from Manuel83/master by swimIan 2017-07-22 07:51:27 -0700
f2fc503 Add files via upload by cocothenut 2017-07-22 11:38:01 +0200
44dec54 Add files via upload by cocothenut 2017-07-22 11:36:32 +0200
91a7b65 Add files via upload by cocothenut 2017-07-22 11:36:01 +0200
2fe3d1d Merge pull request #94 from carlallen/modify_charts_in_plugins by Manuel83 2017-07-22 09:13:10 +0200
1f1f840 Merge pull request #98 from swimIan/patch2 by Manuel83 2017-07-22 09:11:33 +0200
f68e0f4 (refs/pull/98/head) Merge branch 'patch2' of https://github.com/swimIan/craftbeerpi3 into patch2 by swimIan 2017-07-21 15:49:33 -0700
b75926d Removes boiltemp notifications for earlier commit by swimIan 2017-07-21 14:58:52 -0700
aa3420e Merge branch 'patch2' of https://github.com/swimIan/craftbeerpi3 into patch2 by swimIan 2017-07-21 14:58:52 -0700
124a03b Add notification(s) at the end of a mashstep, boilstep, and upon reaching boil temperature. by swimIan 2017-07-20 16:44:57 -0700
af3e1c5 (refs/pull/99/merge) Merge 0f979108d0 into 805b3fae1b by cocothenut 2017-07-21 18:25:08 +0000
0f97910 Add files via upload by cocothenut 2017-07-21 20:23:39 +0200
6b7a28d Add files via upload by cocothenut 2017-07-21 20:23:10 +0200
8a45ca9 Add files via upload by cocothenut 2017-07-21 20:22:37 +0200
1c4e16e Add notification at the end of a mashstep. by swimIan 2017-07-20 16:44:57 -0700
74b5693 Merge pull request #3 from Manuel83/master by swimIan 2017-07-18 21:43:34 -0700
805b3fa Merge pull request #90 from swimIan/master by Manuel83 2017-07-19 06:31:08 +0200
f8d4015 Merge pull request #89 from carlallen/port_param by Manuel83 2017-07-19 06:29:54 +0200
01997f7 (refs/pull/94/head) Allow modifying chart data in plugins by Carl Allen 2017-07-18 15:06:55 -0500
b1eb082 Update __init__.py by flo269 2017-07-18 13:19:11 +0200
11cee90 Update kbh.py by flo269 2017-07-18 13:15:18 +0200
a7d6b1b Update __init__.py by flo269 2017-07-18 13:13:46 +0200
d388933 capitalization and punctuation by flo269 2017-07-18 12:24:03 +0200
296ec09 punctuation by flo269 2017-07-18 12:20:41 +0200
953199f wording by flo269 2017-07-18 12:20:06 +0200
5b293e8 punctuation and wording by flo269 2017-07-18 12:14:58 +0200
59b15ed Wording and punctuation by flo269 2017-07-18 12:12:39 +0200
532431a Update restapi.py by flo269 2017-07-18 12:09:53 +0200
c20536e Typos and punctuation fixed by flo269 2017-07-18 12:05:46 +0200
3e1be62 Update README.md by flo269 2017-07-18 12:01:57 +0200
e2dc261 Update __init__.py by flo269 2017-07-18 11:58:04 +0200
716ab49 One more typo cleaned up by flo269 2017-07-18 11:47:50 +0200
f86c376 Clean up spelling and wording by flo269 2017-07-17 15:39:48 +0200
1184107 (refs/pull/90/head) Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-16 16:59:15 -0700
ea79399 Merge branch 'master' into patch-1 by swimIan 2017-07-16 16:29:23 -0700
bbcf0a4 Merge pull request #2 from swimIan/patch-1 by swimIan 2017-07-16 16:29:23 -0700
7731e32 (refs/pull/85/merge) Merge d6d023798a into ca9575ac29 by swimIan 2017-07-16 23:29:13 +0000
d6d0237 (refs/pull/85/head) Merge branch 'master' into patch-1 by swimIan 2017-07-16 16:29:11 -0700
518a139 Update __init__.py by swimIan 2017-07-16 16:12:46 -0700
a97c5f4 (refs/pull/89/head) Allow setting port by param by Carl Allen 2017-07-16 14:31:45 -0500
9c44d3f Merge pull request #1 from Manuel83/master by swimIan 2017-07-15 23:33:22 -0700
544e9bb Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 23:17:51 -0700
eee5680 Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:54:04 -0700
42e91de Add two more beeps to the buzzer sound by swimIan 2017-07-15 23:04:44 -0700
3c541e0 Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:54:04 -0700
4d08b17 Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:51:29 -0700
be8506d Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:51:29 -0700
98fbcaf Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:49:50 -0700
b40e82a Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 by swimIan 2017-07-15 22:49:50 -0700
a368213 Update beerxml.py by swimIan 2017-07-15 22:43:10 -0700
58fd9a6 Update beerxml.py by swimIan 2017-07-15 22:43:10 -0700
e750fbb Update beerxml.py by swimIan 2017-07-15 22:38:42 -0700
ed9bbed Testing by swimIan 2017-07-15 22:26:08 -0700

1 2 3 4