Skip to content

Commit fb7e32d

Browse files
balloobballoob
committed
Merge branch 'current' into next
2 parents d771d83 + 80b268c commit fb7e32d

File tree

90 files changed

+468
-4187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+468
-4187
lines changed

‎_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ social:
140140
# Home Assistant release details
141141
current_major_version: 0
142142
current_minor_version: 67
143-
current_patch_version: 0
144-
date_released: 2018-04-13
143+
current_patch_version: 1
144+
date_released: 2018-04-17
145145

146146
# Either # or the anchor link to latest release notes in the blog post.
147147
# Must be prefixed with a # and have double quotes around it.
148148
# Major release:
149-
patch_version_notes: "#"
149+
patch_version_notes: "#release-0671---april-17"
150150
# Minor release (Example #release-0431---april-25):
151151

152152
# Date we moved to Discourse for comments

‎sass/custom/_paulus.scss

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ $primary-color: #049cdb;
44

55
.site-header {
66
position: relative;
7+
8+
.site-title {
9+
font-weight: normal;
10+
}
711
}
812

913
.search-container {
@@ -377,18 +381,26 @@ p.note {
377381
}
378382

379383
.copyright {
380-
text-align: center;
384+
text-align: left;
385+
386+
.company {
387+
.title {
388+
font-size: 1.5em;
389+
}
381390

382-
i {
383-
font-size: 3em;
384-
margin-right: 8px;
385-
position: relative;
386-
top: -5px;
391+
img {
392+
vertical-align: middle;
393+
}
394+
395+
i {
396+
font-size: 2em;
397+
padding: 0 5px;
398+
}
387399
}
388-
.credit {
389-
text-align: left;
390-
display: inline-block;
391-
font-size: .8em;
400+
401+
ul {
402+
margin: 0;
403+
list-style: none;
392404
}
393405
}
394406

‎source/_components/dyson.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ dyson:
2626
password: YOUR_DYSON_PASSWORD
2727
language: YOUR_DYSON_ACCOUNT_LANGUGAGE
2828
devices:
29-
- device_id: DEVICE_ID_1 # eg: Pure Cool Link device
29+
- device_id: DEVICE_ID_1 # eg. Serial number: XXX-XX-XXXXXXXX
3030
device_ip: DEVICE_ID_1
31-
- device_id: DEVICE_ID_2 # eg: Eye 360 robot vacuum
31+
- device_id: DEVICE_ID_2
3232
device_ip: DEVICE_ID_2
3333
```
3434
@@ -38,7 +38,7 @@ Configuration variables:
3838
- **password** (*Required*): Dyson account password.
3939
- **language** (*Required*): Dyson account language country code. Known working codes: `FR`, `NL`, `GB`, `AU`. But others codes should work.
4040
- **devices** (*Optional*): List of devices.
41-
- **device_id** (*Required*): Device ID. Available in the mobiles applications (*Settings* page).
41+
- **device_id** (*Required*): Device ID. The Serial Number of the device. Found in the mobiles applications device settings page.
4242
- **device_ip** (*Required*): Device IP address.
4343

4444
`devices` list is optional but you'll have to provide them if discovery is not working (warnings in the logs and the devices are not available in Home Assistant web interface).

‎source/_components/google_assistant.markdown

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ featured: true
1313
ha_release: 0.56
1414
---
1515

16+
<p class='note'>
17+
Use [Home Assistant Cloud](/cloud/) to integrate with Google Assistant without any effort.
18+
</p>
19+
1620
The `google_assistant` component allows you to control things via Google Assistant (on your mobile or tablet) or a Google Home device.
1721

1822
The Google Assistant component requires a bit more setup than most due to the way Google requires Assistant Apps to be set up.
@@ -102,7 +106,7 @@ entity_config:
102106
required: false
103107
type: list
104108
room:
105-
description: Allows for associating this device to a Room in Google Assistant. This is currently non-functional, but will be enabled in the near future.
109+
description: Allows for associating this device to a Room in Google Assistant.
106110
required: false
107111
type: string
108112
{% endconfiguration %}
@@ -134,7 +138,7 @@ If you're not using Linux, you can use sites such as [this one](https://www.brow
134138
1. Create a new project in the [developer console](https://console.actions.google.com/).
135139
a. Add/Import project
136140
b. Click on `BUILD` on the `Smart home` card
137-
c. Type in your home assistant url: `https://[YOUR HOME ASSISTANT URL:PORT]/api/google_assistant`, replace the `[YOUR HOME ASSISTANT URL:PORT]` with the domain / ip address and the port under which your Home Assistant is reachable.
141+
c. Type in your home assistant url: `https://[YOUR HOME ASSISTANT URL:PORT]/api/google_assistant`, replace the `[YOUR HOME ASSISTANT URL:PORT]` with the domain / ip address and the port under which your Home Assistant is reachable.
138142
d. Click `Done`. Then click on `Overview`, which will lead you to the app details screen.
139143
2. You'll need to fill out most of the information on that page, but none of it really matters since you won't be addressing the App directly, only through the Smart Home functionality built into Google Assistant.
140144
3. The final item on that page `Account linking` is required for your app to interact with Home Assistant.

‎source/_components/homekit.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ha_release: 0.64
1212
logo: apple-homekit.png
1313
---
1414

15-
The `HomeKit` component allows you to forward entities from Home Assistant to Apple `HomeKit`, so they could be controlled from Apple `Home` app and `Siri`. Please make sure that you have read the [considerations](#considerations) listed below to save you some trouble later.
15+
The `HomeKit` component allows you to forward entities from Home Assistant to Apple `HomeKit`, so they can be controlled from Apple's `Home` app and `Siri`. Please make sure that you have read the [considerations](#considerations) listed below to save you some trouble later.
1616

1717
<p class="note warning">
1818
It might be necessary to install an additional package:
@@ -87,7 +87,7 @@ To enable the `HomeKit` component in Home Assistant, add the following to your c
8787
homekit:
8888
```
8989
90-
After Home Assistant has started, the entities specified by the filter are exposed to `HomeKit` if the are [supported](#supported-components). To add them:
90+
After Home Assistant has started, the entities specified by the filter are exposed to `HomeKit` if they are [supported](#supported-components). To add them:
9191
1. Open the Home Assistant frontend. A new card will display the `pin code`.
9292
1. Open the `Home` app.
9393
2. Choose `Add Accessory`, than select `Don't Have a Code or Can't Scan?` and enter the `pin code`.
@@ -107,7 +107,7 @@ Currently this component uses the `entity_id` to generate a unique `accessory id
107107

108108
### {% linkable_title Persistence Storage %}
109109

110-
Unfortunately `HomeKit` doesn't support any kind of persistence storage, only the configuration for accessories that are added to the `Home Assistant Bridge` are kept. To avoid problems it is recommended to use an automation to always start `HomeKit` with at least the same entities setup. If for some reason some entities are not setup, their config will be deleted. (State unknown or similar will not cause any issues.)
110+
Unfortunately `HomeKit` doesn't support any kind of persistent storage - only the configuration for accessories that are added to the `Home Assistant Bridge` are kept. To avoid problems it is recommended to use an automation to always start `HomeKit` with at least the same entities setup. If for some reason some entities are not setup, their config will be deleted. (State unknown or similar will not cause any issues.)
111111

112112
A common situation might be if you decide to disable parts of the configuration for testing. Please make sure to disable `auto start` and `turn off` the `Start HomeKit` automation (if you have one).
113113

‎source/_components/sensor.sabnzbd.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Note that this will create the following sensors:
6868
- sensor.sabnzbd_left
6969
- sensor.sabnzbd_disk
7070
- sensor.sabnzbd_disk_free
71-
- sensor.sabnzdb_queue_count
71+
- sensor.sabnzbd_queue_count
7272
```
7373

7474
As always, you can determine the names of sensors by looking at the dev-state page `< >` in the web interface.

‎source/_components/switch.raincloud.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ switch:
2525
2626
Configuration variables:
2727
28-
- **watering_minutes** (*Optional*): Value in minutes to watering your garden via frontend. Defaults to 15.
28+
- **watering_minutes** (*Optional*): Value in minutes to watering your garden via frontend. Defaults to 15. The values allowed are: 5, 10, 15, 30, 45, 60.
2929
- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. If not specified, all conditions below will be enabled by default. The following conditions can be monitored.
3030
- **auto_watering**: Toggle the watering scheduled per zone.
3131
- **manual_watering**: Toggle manually the watering per zone. It will inherent the value in minutes specified on the RainCloud hub component.

‎source/_components/thethingsnetwork.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The Things network support various integrations to make the data available:
2020
| The Things Network Integration | Home Assistant platform |
2121
|---|---|
2222
| [MQTT](https://www.thethingsnetwork.org/docs/applications/mqtt/) | |
23-
| [Storage](https://www.thethingsnetwork.org/docs/applications/storage/) | [`thethingsnetwork`](/component/sensor.thethingsnetwork/) |
23+
| [Storage](https://www.thethingsnetwork.org/docs/applications/storage/) | [`thethingsnetwork`](/components/sensor.thethingsnetwork/) |
2424
| [HTTP](https://www.thethingsnetwork.org/docs/applications/http/) | |
2525

2626
### {% linkable_title Setup %}

‎source/_includes/asides/developers_navigation.html

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎source/_includes/asides/help_navigation.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<section class="aside-module grid__item one-whole lap-one-half">
2+
{% include edit_github.html %}
3+
4+
<div class='section'>
5+
<h1 class="title delta">&nbsp;</h1>
6+
<ul class='divided sidebar-menu'>
7+
<li>
8+
{% active_link /help/ Help %}
9+
</li>
10+
<li>
11+
<a href='https://developers.home-assistant.io'>Developer documentation <i class='icon-external-link'></i></a>
12+
</li>
13+
<li>
14+
{% active_link /developers/documentation/ Website/Documentation %}
15+
<ul>
16+
<li>{% active_link /developers/documentation/standards/ Standards %}</li>
17+
<li>{% active_link /developers/documentation/create_page/ Create a new page %}</li>
18+
</ul>
19+
</li>
20+
<li>
21+
Governance
22+
<ul>
23+
<li>{% active_link /developers/cla/ Contributor License Agreement %}</li>
24+
<li>{% active_link /privacy/ Privacy Policy %}</li>
25+
<li>{% active_link /tos/ Terms of Service %}</li>
26+
<li>{% active_link /code_of_conduct/ Code of Conduct %}</li>
27+
<li>{% active_link /developers/credits/ Credits %}</li>
28+
<li>{% active_link /developers/license/ License %}</li>
29+
</ul>
30+
</li>
31+
</ul>
32+
</div>
33+
</section>

‎source/_includes/custom/footer.html

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1-
<div class="copyright">
2-
<a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
3-
<a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
4-
<a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
5-
<a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
1+
<div class="copyright grid">
2+
<div class='company grid__item one-third lap-one-half palm-one-whole'>
3+
<div class="title">
4+
<img width="40" src="/demo/favicon-192x192.png"> Home Assistant
5+
</div>
6+
<div class="icons">
7+
<a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
8+
<a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
9+
<a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
10+
<a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
11+
</div>
12+
</div>
13+
14+
<div class='grid__item one-third lap-one-half palm-one-whole'>
15+
<ul>
16+
<li><a href='https://developers.home-assistant.io'>Developers</a></li>
17+
<li><a href='mailto:hello@home-assistant.io'>Contact</a> (no support!)</li>
18+
<li><a href='/privacy/'>Privacy</a></li>
19+
</ul>
20+
</div>
621

7-
<div class="credit">
8-
Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a> (no support!).<br>
9-
Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
22+
<div class='grid__item one-third lap-one-half palm-one-whole'>
23+
Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the
24+
<a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.
1025
Hosted by <a href='https://www.netlify.com/'>Netlify</a>.
1126
</div>
12-
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">home-assistant.io</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
1327
</div>

‎source/_includes/custom/navigation.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<li><a href="/components/">Components</a></li>
1414
<li><a href="/docs/">Docs</a></li>
1515
<li><a href="/cookbook/">Examples</a></li>
16-
<li><a href="/developers/">Developers</a></li>
1716
<li><a href="/blog/">Blog</a></li>
1817
<li><a href="/help/">Need help?</a></li>
1918
<li><a href='#' class='show-search'><i class="icon-search"></i></a></li>

0 commit comments

Comments
 (0)