diff --git a/atom.xml b/atom.xml index 9fc318ce52..e6c16f1d89 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ @@ -28,7 +28,7 @@

Moving forward this Code of Conduct will be active for all projects within the Home Assistant organisation.

-

Read the Code of Conduct

+

Read the Code of Conduct

Contributor License Agreement

diff --git a/blog/2017/01/21/home-assistant-governance/index.html b/blog/2017/01/21/home-assistant-governance/index.html index 4fbbd60f91..d5b13bff70 100644 --- a/blog/2017/01/21/home-assistant-governance/index.html +++ b/blog/2017/01/21/home-assistant-governance/index.html @@ -119,7 +119,7 @@

Moving forward this Code of Conduct will be active for all projects within the Home Assistant organisation.

-

Read the Code of Conduct

+

Read the Code of Conduct

Contributor License Agreement

diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index ba8d538352..cdcd08ad5d 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: community | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 43f528f18a..2ff809ff0b 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index cb9e97dca6..44f9d2e178 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 75fbcdff97..1669c25272 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 513bd29759..bde54b9193 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index 452e128e6c..8e23e7aee6 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 9fb4cd2487..ec60745d73 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index a4fac7e489..8d70c0948d 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index c0d1897cd2..41f36e397e 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 3e2bb568bf..e54a79e923 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ @@ -30,7 +30,7 @@ Moving forward this Code of Conduct will be active for all projects within the H [Read the Code of Conduct][coc] -[coc]: http://contributor-covenant.org/version/1/4/ +[coc]: /developers/code_of_conduct/ ## Contributor License Agreement diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index e62fdfcf43..62b092d6d6 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 2a3c6d748d..b70ccb68a1 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 7977a5fd46..c58dced51a 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 289b58441a..e281220373 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 81df37a984..c0a2d008c3 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 47dafc5d7f..274235bd5e 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index f0b566dd74..1dcdfe2154 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index cf4bab35a6..65874b8028 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 146b48c7b3..8881119859 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 86ff9e1837..526a8e9c8f 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-01-23T01:02:04+00:00 + 2017-01-23T01:17:06+00:00 https://home-assistant.io/ diff --git a/blog/index.html b/blog/index.html index f4c20f9d6b..d283f3cdef 100644 --- a/blog/index.html +++ b/blog/index.html @@ -123,7 +123,7 @@

Moving forward this Code of Conduct will be active for all projects within the Home Assistant organisation.

-

Read the Code of Conduct

+

Read the Code of Conduct

Contributor License Agreement

diff --git a/developers/cla.markdown b/developers/cla.markdown deleted file mode 100644 index fab330fb2f..0000000000 --- a/developers/cla.markdown +++ /dev/null @@ -1,63 +0,0 @@ ----- -layout: page -title: "Contributor License Agreement" -description: "The Code of Conduct for Home Assistant projects." -date: 2017-01-21 15:05:00 -0800 -sidebar: true -comments: false -sharing: true -footer: true ----- - -The following terms are used throughout this agreement: - -**You** - the person or legal entity including its affiliates asked to accept this agreement. -An affiliate is any entity that controls or is controlled by the legal entity, or is under common control with it. - -**Project** - is an umbrella term that refers to any and all Home Assistant open source projects. - -**Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing work. - -**Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or -verbal communication with Home Assistant, contributors or maintainers. - -# 1. Grant of Copyright License. - -Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, -users and to Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, -prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such -derivative works. Except for this license, You reserve all rights, title, and interest in your contributions. - -# 2. Grant of Patent License. - -Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to -Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent -license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where such license -applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of -your contribution with the project to which this contribution was submitted. - -If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging that -your contribution or any project it was submitted to constitutes or is responsible for direct or contributory patent infringement, -then any patent licenses granted to that entity under this agreement shall terminate as of the date such litigation is filed. - -# 3. Source of Contribution. - -Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, -is covered under an appropriate open source license and you have the right under that license to submit that work with modifications, -whether created in whole or in part by you, or you have clearly identified the source of the contribution and any license or other -restriction (like related patents, trademarks, and license agreements) of which you are personally aware. - -## Attribution - -This Contributor License Agreement is adapted from the [GitHub CLA][github-cla]. - -## Signing - -To sign this CLA you must first submit a pull request to a repository under the Home Assistant organization. - -## Adoption - -This Contributor License Agreement (CLA) was first announced on January 21st, 2017 in [this][cla-blog] blog post and adopted January 28th, 2017. - -[github-cla]: https://cla.github.com/agreement -[cla-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/ diff --git a/developers/cla/index.html b/developers/cla/index.html new file mode 100644 index 0000000000..ddbe086f20 --- /dev/null +++ b/developers/cla/index.html @@ -0,0 +1,278 @@ + + + + + + + + + + Contributor License Agreement - Home Assistant + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+
+ +
+ + +
+ + + + +
+

+ Contributor License Agreement +

+
+
+ + +

The following terms are used throughout this agreement:

+ +

You - the person or legal entity including its affiliates asked to accept this agreement. +An affiliate is any entity that controls or is controlled by the legal entity, or is under common control with it.

+ +

Project - is an umbrella term that refers to any and all Home Assistant open source projects.

+ +

Contribution - any type of work that is submitted to a Project, including any modifications or additions to existing work.

+ +

Submitted - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or +verbal communication with Home Assistant, contributors or maintainers.

+ +

1. Grant of Copyright License.

+ +

Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, +users and to Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, +prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such +derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.

+ +

2. Grant of Patent License.

+ +

Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to +Home Assistant a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent +license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where such license +applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of +your contribution with the project to which this contribution was submitted.

+ +

If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging that +your contribution or any project it was submitted to constitutes or is responsible for direct or contributory patent infringement, +then any patent licenses granted to that entity under this agreement shall terminate as of the date such litigation is filed.

+ +

3. Source of Contribution.

+ +

Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, +is covered under an appropriate open source license and you have the right under that license to submit that work with modifications, +whether created in whole or in part by you, or you have clearly identified the source of the contribution and any license or other +restriction (like related patents, trademarks, and license agreements) of which you are personally aware.

+ +

Attribution

+ +

This Contributor License Agreement is adapted from the GitHub CLA.

+ +

Signing

+ +

To sign this CLA you must first submit a pull request to a repository under the Home Assistant organization.

+ +

Adoption

+ +

This Contributor License Agreement (CLA) was first announced on January 21st, 2017 in this blog post and adopted January 28th, 2017.

+ + + +
+ + +
+ + + + +
+
+ + + + + + \ No newline at end of file diff --git a/sitemap.xml b/sitemap.xml index da0d5ffe9f..de318034ac 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -465,6 +465,9 @@ https://home-assistant.io/getting-started/browsers/ +https://home-assistant.io/developers/cla/ + + https://home-assistant.io/developers/cla_sign/ @@ -2629,62 +2632,62 @@ https://home-assistant.io/demo/frontend.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/index.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:24+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:25+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:25+00:00 https://home-assistant.io/static/mdi-demo.html -2017-01-23T01:01:20+00:00 +2017-01-23T01:16:25+00:00