Skip to content

Commit e0acd23

Browse files
craigjmidwintercraigjmidwinter
committed
Merge branch 'next' of github.com:home-assistant/home-assistant.github.io into next
2 parents 468d276 + c544427 commit e0acd23

File tree

1,606 files changed

+59694
-7016
lines changed

Some content is hidden

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

1,606 files changed

+59694
-7016
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33

44
**Pull request in [home-assistant](https://github.com/home-assistant/home-assistant) (if applicable):** home-assistant/home-assistant#<home-assistant PR number goes here>
55

6+
## Checklist:
7+
8+
- [ ] Branch: Fixes, changes and adjustments should be created against `current`. New documentation for platforms/components and features should go to `next`.
9+
- [ ] The documentation follow the [standards][standards].
10+
11+
[standards]: https://home-assistant.io/developers/documentation/standards/

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ source/stylesheets/screen.css
1111
vendor
1212
node_modules
1313
source/.jekyll-metadata
14+
*.iml
15+
.idea/

‎.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>home-assistant.github.io</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.1

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
sudo: false
33
cache: bundler
4-
script: bundle exec rake generate
4+
script: travis_wait bundle exec rake generate
55
after_success:
66
- '[ "${TRAVIS_BRANCH}" = "current" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && bundle exec rake deploy || false'

‎CLA.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Contributor License Agreement
2+
3+
The following terms are used throughout this agreement:
4+
5+
**You** - the person or legal entity including its affiliates asked to accept this agreement.
6+
An affiliate is any entity that controls or is controlled by the legal entity, or is under common control with it.
7+
8+
**Project** - is an umbrella term that refers to any and all Home Assistant open source projects.
9+
10+
**Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing work.
11+
12+
**Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or
13+
verbal communication with Home Assistant, contributors or maintainers.
14+
15+
# 1. Grant of Copyright License.
16+
17+
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors,
18+
users and to Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
19+
prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such
20+
derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.
21+
22+
# 2. Grant of Patent License.
23+
24+
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to
25+
Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent
26+
license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where such license
27+
applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of
28+
your contribution with the project to which this contribution was submitted.
29+
30+
If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging that
31+
your contribution or any project it was submitted to constitutes or is responsible for direct or contributory patent infringement,
32+
then any patent licenses granted to that entity under this agreement shall terminate as of the date such litigation is filed.
33+
34+
# 3. Source of Contribution.
35+
36+
Your contribution is either your original creation, based upon previous work that, to the best of your knowledge,
37+
is covered under an appropriate open source license and you have the right under that license to submit that work with modifications,
38+
whether created in whole or in part by you, or you have clearly identified the source of the contribution and any license or other
39+
restriction (like related patents, trademarks, and license agreements) of which you are personally aware.
40+
41+
## Attribution
42+
43+
This Contributor License Agreement is adapted from the [GitHub CLA][github-cla].
44+
45+
## Signing
46+
47+
To sign this CLA you must first submit a pull request to a repository under the Home Assistant organization.
48+
49+
## Adoption
50+
51+
This Contributor License Agreement (CLA) was first announced on January 21st, 2017 in [this][cla-blog] blog post and adopted January 28th, 2017.
52+
53+
[github-cla]: https://cla.github.com/agreement
54+
[cla-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/

‎CODE_OF_CONDUCT.md

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [safety@home-assistant.io][email]. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available [here][version].
72+
73+
## Adoption
74+
75+
This Code of Conduct was first adopted January 21st, 2017 and announced in [this][coc-blog] blog post.
76+
77+
[homepage]: http://contributor-covenant.org
78+
[version]: http://contributor-covenant.org/version/1/4/
79+
[email]: mailto:safety@home-assistant.io
80+
[coc-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/

‎Gemfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,18 @@ 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'
7-
gem 'rdiscount', '~> 2.0'
8-
gem 'RedCloth', '~> 4.2'
9-
gem 'haml', '~> 4.0'
106
gem 'compass', '~> 0.12'
117
gem 'sass-globbing', '~> 1.0'
12-
gem 'rubypants', '~> 0.2'
13-
gem 'rb-fsevent', '~> 0.9'
148
gem 'stringex', '~> 1.4'
15-
gem 'execjs'
16-
gem 'therubyracer', :platforms => :ruby
17-
gem 'coderay'
189
gem 'pry'
1910
end
2011

2112
group :jekyll_plugins do
2213
gem 'jekyll-paginate'
14+
gem 'jekyll-redirect-from'
2315
gem 'jekyll-sitemap'
2416
gem 'jekyll-time-to-read'
2517
gem 'octopress', '~> 3.0'
26-
gem 'octopress-filters'
2718
gem 'octopress-include-tag'
2819
end
2920

‎Gemfile.lock

Lines changed: 24 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.3.2)
5-
addressable (2.4.0)
6-
chunky_png (1.3.6)
4+
addressable (2.5.2)
5+
public_suffix (>= 2.0.2, < 4.0)
6+
chunky_png (1.3.8)
77
coderay (1.1.1)
88
colorator (1.1.0)
99
compass (0.12.7)
1010
chunky_png (~> 1.2)
1111
fssm (>= 0.2.7)
1212
sass (~> 3.2.19)
13-
execjs (2.7.0)
14-
ffi (1.9.14)
13+
ffi (1.9.18)
1514
forwardable-extended (2.6.0)
1615
fssm (0.2.10)
17-
haml (4.0.7)
18-
tilt
19-
jekyll (3.2.1)
16+
jekyll (3.5.2)
17+
addressable (~> 2.4)
2018
colorator (~> 1.0)
2119
jekyll-sass-converter (~> 1.0)
2220
jekyll-watch (~> 1.1)
2321
kramdown (~> 1.3)
24-
liquid (~> 3.0)
22+
liquid (~> 4.0)
2523
mercenary (~> 0.3.3)
2624
pathutil (~> 0.9)
2725
rouge (~> 1.7)
2826
safe_yaml (~> 1.0)
2927
jekyll-paginate (1.1.0)
28+
jekyll-redirect-from (0.12.1)
29+
jekyll (~> 3.3)
3030
jekyll-sass-converter (1.3.0)
3131
sass (~> 3.2)
32-
jekyll-sitemap (0.11.0)
33-
addressable (~> 2.4.0)
32+
jekyll-sitemap (1.1.1)
33+
jekyll (~> 3.3)
3434
jekyll-time-to-read (0.1.2)
3535
jekyll
3636
jekyll-watch (1.5.0)
3737
listen (~> 3.0, < 3.1)
38-
kramdown (1.12.0)
39-
libv8 (3.16.14.15)
40-
liquid (3.0.6)
38+
kramdown (1.14.0)
39+
liquid (4.0.0)
4140
listen (3.0.8)
4241
rb-fsevent (~> 0.9, >= 0.9.4)
4342
rb-inotify (~> 0.9, >= 0.9.7)
@@ -55,12 +54,7 @@ GEM
5554
colorator
5655
octopress-escape-code (2.1.1)
5756
jekyll (~> 3.0)
58-
octopress-filters (1.4.0)
59-
jekyll
60-
octopress-hooks (~> 2.0)
61-
rubypants-unicode
62-
titlecase
63-
octopress-hooks (2.6.1)
57+
octopress-hooks (2.6.2)
6458
jekyll (>= 2.0)
6559
octopress-include-tag (1.1.3)
6660
jekyll (>= 2.0)
@@ -69,70 +63,50 @@ GEM
6963
jekyll (>= 2.0)
7064
pathutil (0.14.0)
7165
forwardable-extended (~> 2.6)
72-
posix-spawn (0.3.11)
7366
pry (0.10.4)
7467
coderay (~> 1.1.0)
7568
method_source (~> 0.8.1)
7669
slop (~> 3.4)
77-
pygments.rb (0.6.3)
78-
posix-spawn (~> 0.3.6)
79-
yajl-ruby (~> 1.2.0)
80-
rack (1.6.4)
70+
public_suffix (3.0.0)
71+
rack (1.6.8)
8172
rack-protection (1.5.3)
8273
rack
8374
rake (10.5.0)
84-
rb-fsevent (0.9.7)
85-
rb-inotify (0.9.7)
86-
ffi (>= 0.5.0)
87-
rdiscount (2.2.0.1)
88-
redcarpet (3.3.4)
89-
ref (2.0.0)
75+
rb-fsevent (0.10.2)
76+
rb-inotify (0.9.10)
77+
ffi (>= 0.5.0, < 2)
78+
redcarpet (3.4.0)
9079
rouge (1.11.1)
91-
rubypants (0.5.0)
92-
rubypants-unicode (0.2.5)
9380
safe_yaml (1.0.4)
9481
sass (3.2.19)
9582
sass-globbing (1.1.5)
9683
sass (>= 3.1)
97-
sinatra (1.4.7)
84+
sinatra (1.4.8)
9885
rack (~> 1.5)
9986
rack-protection (~> 1.4)
10087
tilt (>= 1.3, < 3)
10188
slop (3.6.0)
10289
stringex (1.5.1)
103-
therubyracer (0.12.2)
104-
libv8 (~> 3.16.14.0)
105-
ref
106-
tilt (2.0.5)
90+
tilt (2.0.8)
10791
titlecase (0.1.1)
108-
yajl-ruby (1.2.1)
10992

11093
PLATFORMS
11194
ruby
11295

11396
DEPENDENCIES
114-
RedCloth (~> 4.2)
115-
coderay
11697
compass (~> 0.12)
117-
execjs
118-
haml (~> 4.0)
11998
jekyll (~> 3.0)
12099
jekyll-paginate
100+
jekyll-redirect-from
121101
jekyll-sitemap
122102
jekyll-time-to-read
123103
octopress (~> 3.0)
124-
octopress-filters
125104
octopress-include-tag
126105
pry
127-
pygments.rb (~> 0.6.3)
128106
rake (~> 10.0)
129-
rb-fsevent (~> 0.9)
130-
rdiscount (~> 2.0)
131-
rubypants (~> 0.2)
132107
sass-globbing (~> 1.0)
133108
sinatra (~> 1.4.2)
134109
stringex (~> 1.4)
135-
therubyracer
136110

137111
BUNDLED WITH
138-
1.10.6
112+
1.15.4

0 commit comments

Comments
 (0)