Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge from Development #116

Closed
wants to merge 245 commits into from
Closed

merge from Development #116

wants to merge 245 commits into from

Conversation

avollkopf
Copy link
Contributor

No description provided.

avollkopf and others added 30 commits March 8, 2022 07:32
@avollkopf
Merge pull request #45 from craftbeerpi/development_fermentersteps
f3cd341 
Transfer from organization dev branch that has now fermentersteps
@avollkopf
Merge pull request #46 from craftbeerpi/master
bdc534e 
Align with upstream
@avollkopf
Merge pull request #93 from craftbeerpi/development
8a0061f 
Development environment for vscode | spunding
@avollkopf
Merge pull request #47 from craftbeerpi/master
6f458b4 
Fetch upstream
@avollkopf
Merge pull request #94 from craftbeerpi/development
4a4eed8 
disable sorting of elements by default
@avollkopf
Merge branch 'craftbeerpi:master' into master
f36b6d3
@avollkopf
Merge branch 'craftbeerpi:development' into development
043e753
@avollkopf
Merge pull request #95 from craftbeerpi/development
988f19e 
bug fix plugin create in cli.py
@avollkopf
Merge branch 'craftbeerpi:master' into master
a00b77b
@avollkopf
Merge branch 'craftbeerpi:development' into development
a8b745c
@avollkopf
rename app to cbpi4 for test release
d36c18c
@avollkopf
minor adaptions for release test
29cc09c
@avollkopf
adapt for release test with different gui package
b1bd3dc
@avollkopf
some updated links
59274f2
@avollkopf
change docker ui to main
4744070
@avollkopf
Merge pull request #48 from avollkopf/testrelease
261b391 
merge in Testrelease
@avollkopf
update README
4cb340b
@avollkopf
Update README.md
d209472
@avollkopf
Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4…
3c88017 
… into development
@avollkopf
update workflow
d148dc0
@avollkopf
Version change fr release
e2c2e88
@avollkopf
Merge pull request #49 from avollkopf/development
f966419 
Development -> version update for release
@avollkopf
Add license information to setup.py
e86c3d2
@avollkopf
Merge pull request #50 from avollkopf/development
25c96b2 
Add license information to setup.py
@avollkopf
fix restor backup issue
9634e87
@avollkopf
Merge pull request #51 from avollkopf/development
58175bf 
fix restore backup issue
@chappo
Set Power to Zero if Switched Off
55db17e 
Set power to Zero if the actor is switched off.
@chappo
Set power to Zero if the actor is switched off.
a4f1de3 
Set power to Zero if the actor is switched off.
@phylax2020
Missing string conversion of value in log_data function.
4652b2b
@phylax2020
limit log data transfer to not exceed 2 times max_rows = 1000 rows by…
e95237e 
… removing every nth row. This keeps the user interface operable.
avollkopf and others added 28 commits April 8, 2023 15:21
@avollkopf
requirement aiohttp -> 3.8.4
f990e0e
@avollkopf
fixed bug in parameter generation -> source | options order
1d6cd75
@avollkopf
added update parameter to list
639efe7
@avollkopf
changed api get all config parameters
9f2f4c8
@prash3r
implements the log_data() hook
f01bdb9
@prash3r
moves influxDB integration into extensions folder
4eebb17
@prash3r
moves CSV Sensor logging into core extension
384a8d5
@avollkopf
update influx parameter description and remove port parameter automat…
e483ef6 
…ically
@avollkopf
Merge branch 'development' into plugin-settings-selection-test
f37fd31
@avollkopf
Merge pull request #109 from PiBrewing/plugin-settings-selection-test
4fb67ad 
Plugin settings selection test
@prash3r
Merge branch 'development', remote-tracking branch 'upstream' into ho…
0d164e8 
…okable-log-data-revisited
@prash3r
hookable log data debugging fixes
7fd6361
@prash3r
modified tests for hookable log data
125bd07
@prash3r
repaires log clearence from analytics page
955409d
@prash3r
removes unnecessary comments previously used as ToDo-List
819c9f3
@avollkopf
Merge pull request #110 from prash3r/hookable-log-data-revisited
e01850f 
Hookable log data revisited
@avollkopf
update config parameters with version change and bump version
9558f3e
@avollkopf
bump to rc1
0441b73
@avollkopf
address dependabot alert #3 (https://github.com/PiBrewing/craftbeerpi…
8aa773d 
…4/security/dependabot/3)
@avollkopf
changed cryptography requirement due to dependabot alarm
eb646fc
@avollkopf
Revert "changed cryptography requirement due to dependabot alarm"
af97dc8 
This reverts commit eb646fc.
@avollkopf
bump version to release
1d9b27e
@avollkopf
adapted requirements (cryptography/pyopenssl for security, asyncio-mq…
355376a 
…tt to aiomqtt due to change of package name)
@avollkopf
test: add wait time for influxdb if no connection can be established …
a301276 
…after several retries -> currently, there seems to be interference with mqtt.
@avollkopf
change requirements (depemdabot recommendation)
d6c2e46
@avollkopf
activate break to mqtt listen loop on cancel -> prevent sigkill on st…
2eece20 
…op or restart service
@avollkopf
update version # for previous push
4dee07f
@avollkopf
bump version
17d49d5
@avollkopf avollkopf closed this Jul 30, 2023
papauorg pushed a commit to papauorg/craftbeerpi4 that referenced this pull request Oct 2, 2023
@avollkopf
Merge pull request craftbeerpi#116 from PiBrewing/development
47be753 
merge from Development
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@avollkopf @chappo @phylax2020 @prash3r @lopelex @papauorg @mstrinzha @pascal1404