Skip to content

Commit 028f822

Browse files
dgomesdgomes
authored
Merge branch 'next' into upnp_update
2 parents 9e3a0fb + a4f2fba commit 028f822

File tree

137 files changed

+3247
-362
lines changed

Some content is hidden

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

137 files changed

+3247
-362
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
group :development do
44
gem 'rake', '~> 10.0'
55
gem 'jekyll', '~> 3.0'
6-
gem 'pygments.rb', '~> 0.6.3'
6+
gem 'pygments.rb', '~> 1.1.2'
77
gem 'rdiscount', '~> 2.0'
88
gem 'RedCloth', '~> 4.2'
99
gem 'haml', '~> 4.0'

‎Gemfile.lock

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ GEM
4545
rb-inotify (~> 0.9, >= 0.9.7)
4646
mercenary (0.3.6)
4747
method_source (0.8.2)
48+
multi_json (1.12.1)
4849
octopress (3.0.11)
4950
jekyll (>= 2.0)
5051
mercenary (~> 0.3.2)
@@ -71,14 +72,12 @@ GEM
7172
jekyll (>= 2.0)
7273
pathutil (0.14.0)
7374
forwardable-extended (~> 2.6)
74-
posix-spawn (0.3.11)
7575
pry (0.10.4)
7676
coderay (~> 1.1.0)
7777
method_source (~> 0.8.1)
7878
slop (~> 3.4)
79-
pygments.rb (0.6.3)
80-
posix-spawn (~> 0.3.6)
81-
yajl-ruby (~> 1.2.0)
79+
pygments.rb (1.1.2)
80+
multi_json (>= 1.0.0)
8281
rack (1.6.4)
8382
rack-protection (1.5.3)
8483
rack
@@ -107,7 +106,6 @@ GEM
107106
ref
108107
tilt (2.0.5)
109108
titlecase (0.1.1)
110-
yajl-ruby (1.2.1)
111109

112110
PLATFORMS
113111
ruby
@@ -127,7 +125,7 @@ DEPENDENCIES
127125
octopress-filters
128126
octopress-include-tag
129127
pry
130-
pygments.rb (~> 0.6.3)
128+
pygments.rb (~> 1.1.2)
131129
rake (~> 10.0)
132130
rb-fsevent (~> 0.9)
133131
rdiscount (~> 2.0)
@@ -138,4 +136,4 @@ DEPENDENCIES
138136
therubyracer
139137

140138
BUNDLED WITH
141-
1.10.6
139+
1.14.6

‎_config.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ collections:
7777
output: true
7878
addons:
7979
output: true
80+
faq:
81+
output: true
8082

8183
# ----------------------- #
8284
# 3rd Party Settings #
@@ -140,13 +142,13 @@ social:
140142

141143
# Home Assistant release details
142144
current_major_version: 0
143-
current_minor_version: 46
144-
current_patch_version: 1
145-
date_released: 2017-06-09
145+
current_minor_version: 48
146+
current_patch_version: 0
147+
date_released: 2017-07-02
146148

147149
# Either # or the anchor link to latest release notes in the blog post.
148150
# Must be prefixed with a # and have double quotes around it.
149151
# Major release:
150-
patch_version_notes: "#release-0461---june-9"
152+
patch_version_notes: "#"
151153
# Minor release (Example #release-0431---april-25):
152154

‎sass/custom/_component_page.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
}
1515
}
1616

17+
@media only screen and (max-width: $palm-end) {
18+
#components-page {
19+
.hass-option-cards {
20+
.option-card {
21+
width: 100%;
22+
}
23+
}
24+
}
25+
}
26+
1727
@media only screen and (max-width: $lap-end) {
1828
#components-page {
1929
.filter-button-group {
@@ -246,4 +256,4 @@
246256
transform:scale(0);
247257
opacity:0
248258
}
249-
}
259+
}

‎sass/custom/_paulus.scss

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,47 @@
11
@charset "UTF-8";
22

3+
$primary-color: #049cdb;
4+
5+
.site-header {
6+
position: relative;
7+
}
8+
9+
.search-container {
10+
position: absolute;
11+
top: 0;
12+
left: 0;
13+
right: 0;
14+
bottom: 0;
15+
background-color: white;
16+
padding-top: 19px;
17+
padding-right: 15%;
18+
19+
.search {
20+
max-width: 500px;
21+
width: 100%;
22+
border-bottom: 2px solid $primary-color;
23+
float: right;
24+
25+
.algolia-autocomplete {
26+
width: calc(100% - 58px);
27+
margin: 0 10px;
28+
}
29+
30+
input {
31+
border: 0;
32+
width: 100%;
33+
}
34+
}
35+
}
36+
37+
@media only screen and (max-width: $menu-collapse) {
38+
.search-container {
39+
z-index: 20;
40+
padding-right: 5px;
41+
padding-left: 5px;
42+
}
43+
}
44+
345
.hero {
446
background-color: #038FC7;
547
padding-bottom: 0;

‎sass/oscailte/base/_navigation.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,23 @@ header .grid {
8181
font-weight: normal;
8282
font-size: 14px;
8383
line-height: 1;
84+
85+
&.show-search {
86+
padding-left: 0;
87+
padding-right: 0;
88+
}
8489
}
8590

8691
.menu > li > a:hover, .menu > li > a:focus{
8792
background: $site-background;
8893
box-shadow: inset 0px 5px $navigation-color;
8994
color: $navigation-color;
90-
padding: 40px 12px 24px;
95+
padding-top: 40px;
96+
padding-bottom: 24px;
9197
}
9298

93-
.toggle{
94-
z-index: 20;
99+
.toggle{
100+
z-index: 20;
95101
}
96102

97103
@media only screen and (max-width: $menu-collapse){

‎source/_addons/dnsmasq.markdown

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ footer: true
1111

1212
Setup and manage a [Dnsmasq](http://thekelleys.org.uk/dnsmasq/doc.html) dns server. This allow your to manipulate some dns requests. I.e. that inside your network, your homeassistant domain will resolve with a internal address.
1313

14-
<p class='note warning'>
15-
At the moment, it will not work with resinos!
14+
<p class='note info'>
15+
`interface` options are for resinos based installation. On other system you can set it to `""`, for listen on every interface.
1616
</p>
1717

1818
```json
@@ -24,6 +24,7 @@ At the moment, it will not work with resinos!
2424
"hosts": [
2525
{"host": "home.mydomain.io", "ip": "192.168.1.10"}
2626
],
27+
"interface": "eth1"
2728
}
2829
```
2930

@@ -32,3 +33,4 @@ Configuration variables:
3233
- **defaults** (*Required*): A list of dns server to forward default requests.
3334
- **forwards** (*Optional*): A list of domains that will forward to a specific server.
3435
- **hosts** (*Optional*): A list of hosts to resolve it static.
36+
- **interface** (*Optional*): If a interface is set, it listen only on this interface. Need to set for resinos.

‎source/_addons/lets_encrypt.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ This add-on need port 80/443 to verify the certificate request, please stop all
1717

1818
```json
1919
{
20+
"challenge": "https",
2021
"email": "example@example.com",
2122
"domains": ["example.com", "mqtt.example.com", "hass.example.com"]
2223
}
2324
```
2425

2526
Configuration variables:
2627

28+
- **challenge** (*Optional*): Default it use 443 ('https') you can change it to 'http' for use port 80.
2729
- **email** (*Required*): Your email address for registration on Let's Encrypt.
2830
- **domains** (*Required*): A list of domains to create/renew the certificate.
2931

‎source/_addons/mariadb.markdown

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
layout: page
3+
title: "MariaDB"
4+
description: "MariaDB Server is one of the most popular database servers in the world."
5+
date: 2017-04-30 13:28
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
---
11+
12+
Set up a [mariadb](https://mariadb.org/) SQL server. It support multible database, users and permission. If you want only connect from inside use `172.17.0.1` as host address.
13+
14+
```json
15+
{
16+
"databases": ["homeassistant"],
17+
"logins": [
18+
{
19+
"username": "hass",
20+
"host": "172.17.0.1",
21+
"password": "securePassword"
22+
}
23+
],
24+
"rights": [
25+
{
26+
"username": "hass",
27+
"host": "172.17.0.1",
28+
"database": "homeassistant",
29+
"grant": "ALL PRIVILEGES ON"
30+
}
31+
]
32+
}
33+
```
34+
35+
Configuration variables:
36+
37+
- **databases** (*Require*): Listen of databases.
38+
- **logins** (*Require*): Listen of logindata they will create or update.
39+
- **username** (*Require*): Username for login.
40+
- **host** (*Require*): Host for login, if you need a login with multibe hosts, use '%'.
41+
- **password** (*Require*): Password for login.
42+
- **rights** (*Require*): Listen of rights to be handle.
43+
- **username** (*Require*): Username for grant rights.
44+
- **host** (*Require*): Host is a part of username like above.
45+
- **database** (*Require*): Database name to grant this user rights to.
46+
- **grant** (*Require*): SQL grant part for access too.
47+
48+
## {% linkable_title Home Assistant configuration %}
49+
50+
Use the following configuration in Home Assistant to use the database above:
51+
52+
```yaml
53+
recorder:
54+
db_url: mysql://hass:securePassword@127.0.0.1/homeassistant
55+
```

‎source/_addons/samba.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This allows you to set up a [Samba](https://samba.org/) server to access hass.io
1313

1414
```json
1515
{
16+
"name": "hassio",
1617
"workgroup": "WORKGROUP",
1718
"guest": true,
1819
"map_config": true,
@@ -25,6 +26,7 @@ This allows you to set up a [Samba](https://samba.org/) server to access hass.io
2526

2627
Configuration variables:
2728

29+
- **name** (*Optional*): default `hassio`. Set netbios name of hassio device.
2830
- **workgroup** (*Optional*): default `WORKGROUP`. Set network workgroup.
2931
- **guest** (*Optional*): Allow login without a username or password. Defaults to `true`.
3032
- **map_config** (*Optional*): Expose Home Assistant configuration folder. Defaults to `true`.

‎source/_addons/ssh.markdown

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,12 @@ If you're coming from Rasbian or similar, use `root` rather than `pi` when conne
3535
Permission denied (publickey,keyboard-interactive)
3636
```
3737
</p>
38+
39+
<p class='note'>
40+
If you install this addon you can use `sshfs` as well to access files from a remote system where you have git and your favourite editing tools installed.
41+
42+
```bash
43+
$ mkdir ~/ha_config
44+
$ sshfs -o allow_other,defer_permissions root@h[your_hassio_ip]:/config ~/ha_config
45+
```
46+
</p>

‎source/_components/axis.markdown

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Home Assistant will automatically discover their presence on your network.
2323
$ sudo apt-get install python3-gi gir1.2-gstreamer-1.0
2424
```
2525

26-
Depending on how you run Home Assistant you might be needed to symlink the `gi` module into your environment.
26+
Depending on how you run Home Assistant, you may need to symlink the `gi` module into your environment.
2727

2828
Hassbian:
2929

@@ -50,21 +50,23 @@ axis:
5050
5151
Configuration variables:
5252
53-
- **device** (*Required*): Unique name for the Axis device.
54-
- **host** (*Required*): The IP address to your Axis device.
55-
- **username** (*Optional*): The username to your Axis device. Defaults to `root`.
56-
- **password** (*Optional*): The password to your Axis device. Defaults to `pass`.
57-
- **trigger_time** (*Optional*): Minimum time (in seconds) a sensor should keep its positive value. Defaults to 0.
58-
- **location** (*Optional*): Physical location of your Axis device. Default not set.
59-
- **include** (*Required*): This cannot be empty else there would be no use adding the device at all.
60-
- **camera**: Stream MJPEG video to Home Assistant.
61-
- **motion**: The built-in motion detection in Axis cameras.
62-
- **vmd3**: ACAP Motion Detection app which has better algorithms for motion detection.
63-
- **pir**: PIR sensor that can trigger on motion.
64-
- **sound**: Sound detector.
65-
- **daynight**: Certain cameras have day/night mode if they have built-in IR lights.
66-
- **tampering**: Signals when camera believes that it has been tampered with.
67-
- **input**: Trigger on whatever you have connected to device input port.
53+
## {% linkable_title Configuration variables %}
54+
55+
- **device** (*Required*): Unique name
56+
- **host** (*Required*): The IP address to your Axis device.
57+
- **username** (*Optional*): The username to your Axis device. Default 'root'.
58+
- **password** (*Optional*): The password to your Axis device. Default 'pass'.
59+
- **trigger_time** (*Optional*): Minimum time (in seconds) a sensor should keep its positive value. Default 0.
60+
- **location** (*Optional*): Physical location of your Axis device. Default not set.
61+
- **include** (*Required*): This cannot be empty else there would be no use adding the device at all.
62+
- **camera**: Stream MJPEG video to Home Assistant.
63+
- **motion**: The built-in motion detection in Axis cameras.
64+
- **vmd3**: ACAP Motion Detection app which has better algorithms for motion detection.
65+
- **pir**: PIR sensor that can trigger on motion.
66+
- **sound**: Sound detector.
67+
- **daynight**: Certain cameras have day/night mode if they have built-in IR lights.
68+
- **tampering**: Signals when camera believes that it has been tampered with.
69+
- **input**: Trigger on whatever you have connected to device input port.
6870
6971
A full configuration example could look like this:
7072
@@ -85,10 +87,29 @@ axis:
8587
location: köket
8688
```
8789
90+
<p class='note'>
91+
If you are using Python3.6 you might need to replace the 34m with 36m in the _gi.*.so filename in the gi folder.
92+
</p>
93+
8894
<p class='note'>
8995
Any specific levels for triggers needs to be configured on the device.
9096
</p>
9197
9298
<p class='note'>
9399
It is recommended that you create a user on your Axis device specifically for Home Assistant. For all current functionality it is enough to create a user belonging to user group viewer.
94100
</p>
101+
102+
## {% linkable_title Device services %}
103+
Available services: `vapix_call`.
104+
105+
#### {% linkable_title Service `axis/vapix_call` %}
106+
Send a command using [Vapix](https://www.axis.com/support/developer-support/vapix). For details please read the API specifications.
107+
108+
| Service data attribute | Optional | Description |
109+
|---------------------------|----------|--------------------------------------------------|
110+
| `name` | no | Name of device to communicate with. |
111+
| `param` | no | What parameter to operate on. |
112+
| `cgi` | yes | Which cgi to call on device. Default is `param.cgi`. |
113+
| `action` | yes | What type of call. Default is `update`. |
114+
115+
Response to call can be subscribed to on event `vapix_call_response`

‎source/_components/binary_sensor.command_line.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Configuration variables:
3333
- **payload_on** (*Optional*): The payload that represents enabled state. Default is "ON".
3434
- **payload_off** (*Optional*): The payload that represents disabled state. Default is "OFF".
3535
- **value_template** (*Optional*): Defines a [template](/docs/configuration/templating/#processing-incoming-data) to extract a value from the payload.
36+
- **scan_interval** (*Optional*): Defines number of seconds for polling interval (defaults to 60 seconds).
3637
3738
## {% linkable_title Examples %}
3839

0 commit comments

Comments
 (0)