Skip to content

Feature/add boost#10407

Closed
KJonline wants to merge 31 commits into
home-assistant:nextfrom
Rendili:feature/add_boost
Closed

Feature/add boost#10407
KJonline wants to merge 31 commits into
home-assistant:nextfrom
Rendili:feature/add_boost

Conversation

@KJonline
Copy link
Copy Markdown
Contributor

Description:
Add boost services to HA and documentation has been updated with service examples and information.

Pull request in home-assistant (if applicable): home-assistant/core#26789

Checklist:

  • Branch: next is for changes and new documentation that will go public with the next Home Assistant release. Fixes, changes and adjustments for the current release should be created against current.
  • The documentation follows the standards.

KJonline and others added 14 commits July 14, 2019 21:18
…nt.io into next

* 'next' of https://github.com/home-assistant/home-assistant.io: (1574 commits)
  Add Twente Milieu integration (home-assistant#9851)
  Add climate services to Homematic IP Cloud (home-assistant#9832)
  Add documentation for Splunk Component entity filter support (home-assistant#9831)
  Added config for multiple accounts - N26 (home-assistant#9577)
  Add Apache Kafka docs (home-assistant#9836)
  Remove monitored conditions from syncthru (home-assistant#9825)
  Cleans up front matter (home-assistant#9835)
  Add WWLLN docs (home-assistant#9802)
  [Toon] New scan_interval on integration level (home-assistant#9488)
  Update alexa.smart_home.markdown (home-assistant#9827)
  Clarify
  media_player volume control (home-assistant#9829)
  Add marker sensor to CUPS (home-assistant#9820)
  Updates climate platform docs for Climate 1.0
  Updates Google Assistant for Climate 1.0
  Updates generic_thermostat for Climate 1.0
  Updates KNX for Climate 1.0
  Updates Stiebel Eltron to Climate 1.0
  Updates Ecobee for Climate 1.0
  Updates Radio Thermostat for Climate 1.0
  ...

# Conflicts:
#	source/_components/climate.hive.markdown
…nt.io into next

* 'next' of https://github.com/home-assistant/home-assistant.io: (66 commits)
  Update totalconnect.markdown (home-assistant#9589)
  add HmIP-FCI1, HmIP-BBL, HmIP-FBL to Homematic IP Cloud (home-assistant#9873)
  Update neato configuration to include vendor support (home-assistant#9882)
  Add documentation for new Rainforest Eagle-200 platform (home-assistant#9761)
  Add MQTT climate precision (home-assistant#9896)
  Adds config validation to configuration plugin (home-assistant#9886)
  Fix example (home-assistant#9899)
  Clarify modes is limited to a specific set. (home-assistant#9897)
  Mode `on` is now `heat` (home-assistant#9893)
  Update climate.markdown (home-assistant#9894)
  Collection of configuration block fixes (home-assistant#9892)
  Collection of configuration block fixes (home-assistant#9884)
  Add info about concurrent use of data and data_template (home-assistant#9889)
  Add info about concurrent use of data and data_template (home-assistant#9890)
  Updating template example (home-assistant#9891)
  Mention podcast
  Mention 25k stars
  Update solaredge_local.markdown (home-assistant#9878)
  Add Py35 msg
  Fix code blocks in breaking changes
  ...
…to next

* 'next' of github.com:home-assistant/home-assistant.io: (46 commits)
  Document port number (home-assistant#10385)
  Update Plex for config flow (home-assistant#10389)
  Add Home Assistant Cast service docs (home-assistant#10339)
  Update changelog.markdown (home-assistant#10344)
  Add options to badges (home-assistant#10286)
  Add icon_code sensor (home-assistant#10365)
  List of expected sensors and their states (home-assistant#10361)
  Enphase envoy Add optional name field (home-assistant#10378)
  Change nzbget to full component (home-assistant#10300)
  Clarify Plex config options (home-assistant#10352)
  Document binary_sensor platfor for iaqualink integration (home-assistant#10354)
  Remove references to legacy configuration method (home-assistant#10345)
  Update ha_release (home-assistant#10346)
  Added doods component documentation (home-assistant#10228)
  Fix NM (home-assistant#10341)
  Plex config changes (home-assistant#10342)
  Add Obihai Integration (home-assistant#10324)
  Document switch platform for iaqualink integration (home-assistant#10335)
  Add password for upc connect (home-assistant#10340)
  Plex common config (home-assistant#10328)
  ...
* next: (46 commits)
  Document port number (home-assistant#10385)
  Update Plex for config flow (home-assistant#10389)
  Add Home Assistant Cast service docs (home-assistant#10339)
  Update changelog.markdown (home-assistant#10344)
  Add options to badges (home-assistant#10286)
  Add icon_code sensor (home-assistant#10365)
  List of expected sensors and their states (home-assistant#10361)
  Enphase envoy Add optional name field (home-assistant#10378)
  Change nzbget to full component (home-assistant#10300)
  Clarify Plex config options (home-assistant#10352)
  Document binary_sensor platfor for iaqualink integration (home-assistant#10354)
  Remove references to legacy configuration method (home-assistant#10345)
  Update ha_release (home-assistant#10346)
  Added doods component documentation (home-assistant#10228)
  Fix NM (home-assistant#10341)
  Plex config changes (home-assistant#10342)
  Add Obihai Integration (home-assistant#10324)
  Document switch platform for iaqualink integration (home-assistant#10335)
  Add password for upc connect (home-assistant#10340)
  Plex common config (home-assistant#10328)
  ...
@probot-home-assistant probot-home-assistant Bot added has-parent This PR has a parent PR in another repo next This PR goes into the next branch labels Sep 21, 2019
@frenck frenck added new-feature This PR adds documentation for a new Home Assistant feature to an existing integration ready-for-review This PR needs to be reviewed labels Sep 21, 2019
@klaasnicolaas
Copy link
Copy Markdown
Member

I think there are many commits from an older PR 🤔

@KJonline
Copy link
Copy Markdown
Contributor Author

I think there are many commits from an older PR 🤔

@klaasnicolaas why would old commits pull through from my previous PR? Do I need to do anything with them and how could I fix it if needed. I am a bit of a beginner with GIT so I am not sure how to remove the old commits from this PR.

@probot-home-assistant probot-home-assistant Bot added the parent-merged The parent PR has been merged already label Sep 27, 2019
@MartinHjelmare
Copy link
Copy Markdown
Member

Before you branch off and create a new feature branch, make sure to pull the latest version of the target branch, eg next in this case, from upstream remote repository.

@KJonline
Copy link
Copy Markdown
Contributor Author

KJonline commented Sep 27, 2019

@MartinHjelmare if I rebased from next. Would this correct the problem?

@MartinHjelmare
Copy link
Copy Markdown
Member

Probably yes.

KJonline added 4 commits September 28, 2019 08:55
…to next

* 'next' of github.com:home-assistant/home-assistant.io: (82 commits)
  Added more ebusd sensors. (home-assistant#10398)
  Describe config options (home-assistant#10450)
  Update ecobee to include config flow instructions (home-assistant#10428)
  Remove deprecated fedex integration (ADR-0004) (home-assistant#10420)
  Remove deprecated usps integration (ADR-0004) (home-assistant#10422)
  Expand entity-filter options (home-assistant#10349)
  Remove deprecated ups integration (ADR-0004) (home-assistant#10423)
  Added 'availability_template' to Template Sensor platform (home-assistant#10308)
  Add documentation for here_travel_time (home-assistant#9648)
  Add Alarm Control Panel to secure devices (home-assistant#10250)
  Remove deprecated linksys_ap integration (ADR-0004) (home-assistant#10434)
  Clarity on emabling MQTT TLS (home-assistant#10453)
  Update vesync.markdown (home-assistant#10444)
  Adds key codes to document (home-assistant#10445)
  Add details about iFrame (home-assistant#10441)
  Update daikin.markdown (home-assistant#10439)
  Missing end bracket of `is_state` function (home-assistant#10440)
  add url action (home-assistant#10413)
  Update homematic.markdown
  Remove deprecated sytadin integration (ADR-0004) (home-assistant#10419)
  ...
KJonline added 2 commits September 28, 2019 08:56
…t.io into feature/add_boost

* 'feature/add_boost' of github.com:KJonline/home-assistant.io:
  Updated based on code review
  Updated hotwater
  Updated Hive Docs
  Add Boost Services Docs
@KJonline
Copy link
Copy Markdown
Contributor Author

Hi @MartinHjelmare, I have rebased the feature branch from the next branch now.

@MartinHjelmare
Copy link
Copy Markdown
Member

There are still old commits in the branch. Just merging next into your branch won't remove the old commits. You need to rebase and rewrite the history of this branch.

Copy link
Copy Markdown
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @KJonline! I've reviewed it and left you some comments. Could you please take a look? Thanks! 👍

Comment thread source/_components/hive.markdown Outdated
redirect_from:
- /components/binary_sensor.hive/
- /components/climate.hive/
- /components/water_heater.hive/
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to create a redirect for this, since the page has not existed before.
Please remove this line.

Comment thread source/_components/hive.markdown Outdated
Comment thread source/_components/hive.markdown Outdated
The `hive` integration is the main integration to set up and integrate all supported Hive devices. Once configured with the minimum required details it will detect and add all Hive devices into Home Assistant, including support for multi zone heating.

This integration uses the unofficial API used in the official Hive website [https://my.hivehome.com](https://my.hivehome.com), and you will need to use the same Username and Password you use on the Hive website to configure this Hive integration in Home Assistant.
This integration uses the unofficial API used in the official Hive website [https://my.hivehome.com](https://my.hivehome.com), and you will need to use the same Username and P you use on the Hive website to configure this Hive integration in Home Assistant.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened to "Password" -> "P" ?

Comment thread source/_components/hive.markdown Outdated
Comment thread source/_components/hive.markdown Outdated
Comment thread source/_components/hive.markdown Outdated
Comment thread source/_components/hive.markdown Outdated
@@ -57,6 +62,62 @@ scan_interval:
default: 2
{% endconfiguration %}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a new chapter here: ## Services

Comment thread source/_components/hive.markdown Outdated
Comment thread source/_components/hive.markdown Outdated
Khole and others added 10 commits September 28, 2019 09:48
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
Co-Authored-By: Franck Nijhof <frenck@frenck.nl>
….github.io into feature/add_boost

# Conflicts:
#	source/_components/hive.markdown
@KJonline
Copy link
Copy Markdown
Contributor Author

Hi @frenck, I have updated files as per your changes. on the point about hotwater and hot water. I have updated the docs and created a second PR updating the in the code to reflect the changes in there also.

@MartinHjelmare , I did a rebase on this branch the merge its referring to is from a couple of weeks ago. Just so you are aware as above I have created a new PR to change hotwater to hot_water in the home assistant code. Please could you review this as I know the other PR has been merged and closed. The new one I created is home-assistant/core#27032

@MartinHjelmare
Copy link
Copy Markdown
Member

You can do a rebase in more than one way. Here we need to remove the old commits during the rebase. If you do an interactive rebase you can select what commits to keep, what to drop and what order they should go.

@probot-home-assistant probot-home-assistant Bot removed ready-for-review This PR needs to be reviewed parent-merged The parent PR has been merged already labels Sep 28, 2019
@KJonline KJonline deleted the feature/add_boost branch September 28, 2019 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has-parent This PR has a parent PR in another repo new-feature This PR adds documentation for a new Home Assistant feature to an existing integration next This PR goes into the next branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants