From f8af05da0bf695e76189ff661dd49e490fef3ec4 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 27 Oct 2015 01:25:17 -0700 Subject: [PATCH] Fixes Conflicts: source/_includes/site/head.html --- .gitignore | 1 - Gemfile.lock | 119 ++++++++++++++++++ source/_components/media_player.cast.markdown | 5 - source/_components/media_player.plex.markdown | 4 + source/_includes/site/head.html | 5 +- ...e-with-esp8266-and-report-to-mqtt.markdown | 1 - 6 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 8a63f6d4a8f..e124ea450ed 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ source/_stash source/stylesheets/screen.css vendor node_modules -Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000000..32a21b3b48f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,119 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + blankslate (2.1.2.4) + chunky_png (1.3.4) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + compass (0.12.7) + chunky_png (~> 1.2) + fssm (>= 0.2.7) + sass (~> 3.2.19) + execjs (2.6.0) + fast-stemmer (1.0.2) + ffi (1.9.10) + fssm (0.2.10) + haml (4.0.7) + tilt + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.3.5) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-sitemap (0.9.0) + jekyll-time-to-read (0.1.1) + jekyll + jekyll-watch (1.3.0) + listen (~> 3.0) + kramdown (1.9.0) + libv8 (3.16.14.13) + liquid (2.6.3) + listen (3.0.3) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + octopress-date-format (2.0.2) + jekyll (~> 2.0) + octopress-hooks (~> 2.0) + octopress-hooks (2.6.1) + jekyll (>= 2.0) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rack (1.6.4) + rack-protection (1.5.3) + rack + rake (10.4.2) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.3.3) + ref (2.0.0) + rubypants (0.2.0) + safe_yaml (1.0.4) + sass (3.2.19) + sass-globbing (1.0.0) + sass (>= 3.1) + sinatra (1.4.6) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + stringex (1.4.0) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref + tilt (2.0.1) + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.2.9) + compass (~> 0.12.2) + execjs + haml (~> 4.0) + jekyll (~> 2.0) + jekyll-sitemap + jekyll-time-to-read + octopress-date-format (~> 2.0) + octopress-hooks (~> 2.2) + rake (~> 10.0) + rb-fsevent (~> 0.9) + rdiscount (~> 2.0) + rubypants (~> 0.2.0) + sass-globbing (~> 1.0.0) + sinatra (~> 1.4.2) + stringex (~> 1.4.0) + therubyracer + +BUNDLED WITH + 1.10.6 diff --git a/source/_components/media_player.cast.markdown b/source/_components/media_player.cast.markdown index 139bb179e63..d8383286dad 100644 --- a/source/_components/media_player.cast.markdown +++ b/source/_components/media_player.cast.markdown @@ -27,8 +27,3 @@ media_player: Configuration variables: - **host** *Optional*: Use only if you don't want to scan for devices. - -

-This platform is currently not working due to a changed Cast API. -

- diff --git a/source/_components/media_player.plex.markdown b/source/_components/media_player.plex.markdown index 4c98446e10b..1d945509d21 100644 --- a/source/_components/media_player.plex.markdown +++ b/source/_components/media_player.plex.markdown @@ -20,15 +20,19 @@ If local authentication is enabled or multiple users are defined, HASS requires If you want to enable the plex platform directly, add the following lines to your `configuration.yaml`: + ```yaml # Example configuration.yaml entry media_player: - platform: plex ``` + You may also need to create the file `plex.conf`. + ``` {'IP_ADDRESS:PORT': {'token': 'TOKEN'}} ``` + - **IP_ADDRESS** *Required*: IP address of the Plex Media Server - **PORT** *required*: Default is 32400 - **TOKEN** *Optional*: Only is authentication is required. Set to `None` (without quotes) otherwise. diff --git a/source/_includes/site/head.html b/source/_includes/site/head.html index 63ab4f5f8c8..c1b47ce8709 100644 --- a/source/_includes/site/head.html +++ b/source/_includes/site/head.html @@ -4,7 +4,8 @@ - {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} + {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %} + {% if page.description %} {% capture fb_description %}{{ page.description }}{% endcapture %} {% else %} {% capture fb_description %}{{ content | raw_content }}{% endcapture %} {% endif %} @@ -20,7 +21,7 @@ - + diff --git a/source/_posts/2015-10-11-measure-temperature-with-esp8266-and-report-to-mqtt.markdown b/source/_posts/2015-10-11-measure-temperature-with-esp8266-and-report-to-mqtt.markdown index bea4341a47c..64c7465ab34 100644 --- a/source/_posts/2015-10-11-measure-temperature-with-esp8266-and-report-to-mqtt.markdown +++ b/source/_posts/2015-10-11-measure-temperature-with-esp8266-and-report-to-mqtt.markdown @@ -83,7 +83,6 @@ reported value. Reports to the MQTT broker are sent with retain set to `True`. T connecting to the MQTT topic will automatically be notified of the last reported value. ```cpp - #include #include #include