Skip to content

Fix open window mode merge conflicts #7

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
Merged
FilBr merged 53 commits into from
Jan 3, 2025
Merged

Fix open window mode merge conflicts #7

FilBr merged 53 commits into from
Jan 3, 2025

Conversation

@FilBr
Copy link
Owner

@FilBr FilBr commented Jan 3, 2025

Description

Provide a clear and concise description of the changes you are proposing.

Example:
"This pull request fixes a bug where the library crashes when an invalid token is provided. It also updates the README with clearer setup instructions."

Related Issues

Link any related issues that this pull request resolves or is associated with:

Example:

Type of Changes

Mark the type of changes included in this pull request:

  • Bugfix
  • New Feature
  • Documentation Update
  • Refactor
  • Other (please specify):

Checklist

  • I have tested the changes locally and they work as expected.
  • I have added/updated necessary documentation (if applicable).
  • I have followed the code style and guidelines of the project.
  • I have searched for and linked any related issues.

Additional Notes

Add any additional comments, screenshots, or context for the reviewer(s).

Thank you for your contribution to PyTado! 🎉

@wmalgadey
added tests for http class
cc9647f
@wmalgadey
Merge pull request wmalgadey#100 from FilBr/master
8a63301 
Fix post-refactor bugs
@wmalgadey
removed obsolete method to create the request class
1d86fa6
@wmalgadey
add types
68b8521
@wmalgadey
add test for hops tado class
41e0b33
@wmalgadey
bumped version to 0.18.4
6239dfb
@wmalgadey
small refactorings
cdc32cd
@wmalgadey
added tests for tado x heating
a318202
@wmalgadey
fixed tado x hvac mode and connection state
4e18402
@wmalgadey
made some changes to tadox devices
cc91edb 
- added better documentation for tado x changes
@wmalgadey
added tariff and genie api
9083ea9
@wmalgadey
added better tests to http class
c860f97
@wmalgadey
fixed error
077e119
@wmalgadey
fixed devices call
9b6967f
@wmalgadey
added test to termination condition
8c5cf4d
@wmalgadey
test to output code coverage in PR and action summary
8750982
@wmalgadey
changed workflow settings
10b8ff2
@wmalgadey
renamed workflows for better transparency
4969329
@wmalgadey
changed job names
a5254bd
@wmalgadey
renamed worflows
e86f8c5
@wmalgadey
add artifact back to lint and test workflow
b543811
@wmalgadey
changed test report artifact name
d60ba28
@wmalgadey
Merge pull request wmalgadey#101 from wmalgadey/show-code-coverage
f5fd83f 
test to output code coverage in PR and action summary
@wmalgadey
adding the minder api from PR !64
321be9d
@wmalgadey
Merge pull request wmalgadey#107 from wmalgadey/minder-api-support
069d422 
adding the minder api from PR !64
@wmalgadey
bumped version to 0.18.5
ac455ed
@wmalgadey
do not break compatibility yet! (wmalgadey#114)
1102bf1
@wmalgadey
add simple contribution guide (wmalgadey#109)
f42e504
@wmalgadey
added pre commit features (wmalgadey#110)
5a9e5d3
@wmalgadey
fixed status badges
91121d2
wmalgadey and others added 23 commits December 21, 2024 13:45
@wmalgadey
changed status badge for release
e5dd148
@wmalgadey
autofixed pre-commit changes
ffb36d1
@wmalgadey
changed pre-commit settings for line-length
d9588fe
@wmalgadey
changed permission settings to report test results
9403e60
@erwindouna
Add Devcontainer (wmalgadey#119)
a31d9e9
@wmalgadey
whitespace removed
058ccd5
@wmalgadey
fixed all pre commit errors (wmalgadey#121)
5a12dba
@wmalgadey
Refactoring by adding a decorator to hops_tado.py (wmalgadey#122)
904f92a
@inverse
Tidy pre-commit config + setup CI (wmalgadey#130)
0be233d
@erwindouna @wmalgadey
Adding minor improvements (wmalgadey#125)
858733f 
Co-authored-by: Wolfgang Malgadey <wolfgang@malgadey.de>
@wmalgadey
Small fixes (wmalgadey#133)
f938ee3
@wmalgadey
add home by bridge api to my tado (wmalgadey#134)
eaec632
@inverse
Support devices with serialNumber as their property (wmalgadey#124)
71849f4
@erwindouna @wmalgadey
Add childlock support (wmalgadey#127)
ac56425 
Co-authored-by: Wolfgang Malgadey <wolfgang@malgadey.de>
@Moritz-Schmidt
fix for autopep8 (wmalgadey#135)
638653d
@wmalgadey
Fixed devcontainer (wmalgadey#136)
51860cd
@inverse
Bootstrap improvements (wmalgadey#137)
a81be2a
@inverse
Fix script naming (wmalgadey#138)
c2310e6
@inverse
Tidy GitHub action pipelines (wmalgadey#139)
dbf2295
@wmalgadey
drop coverage and add codecov.io (wmalgadey#140)
5dbecaf
@inverse
Add main test foundations (wmalgadey#141)
bfab483
@FilBr
Merge branch 'master' into fix-open-window-mode-merge-conflicts
dc0818f
fix: pre-commits
7272721
@FilBr FilBr merged commit 42478b2 into master Jan 3, 2025
8 checks passed
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.

6 participants

@FilBr @wmalgadey @erwindouna @inverse @Moritz-Schmidt