Skip to content

Commit

Permalink
Merge pull request #24 from kangaroo/dev
Browse files Browse the repository at this point in the history
Minor fixes and cleanup
  • Loading branch information
balloob committed Jan 22, 2015
2 parents 4f910be + ed1c98e commit 4d0bd03
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 36 deletions.
2 changes: 1 addition & 1 deletion homeassistant/components/http/frontend.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """
VERSION = "d44fb74a23d83756ed92d5d55f4d81ea"
VERSION = "43699d5ec727d3444985a1028d21e0d9"
57 changes: 24 additions & 33 deletions homeassistant/components/http/www_static/frontend.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion homeassistant/external/wink/pywink.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def get_devices(filter, constructor):
devices = []
for item in items:
id = item.get(filter)
if id is not None:
if (id is not None and item.get("hidden_at") is None):
devices.append(constructor(item))

return devices
Expand Down
8 changes: 7 additions & 1 deletion scripts/build_frontend
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@ mv polymer/bower_components/polymer/polymer.html.bak polymer/bower_components/po
# Generate the MD5 hash of the new frontend
cd ..
echo '""" DO NOT MODIFY. Auto-generated by build_frontend script """' > frontend.py
echo 'VERSION = "'`md5 -q www_static/frontend.html`'"' >> frontend.py
if [ $(command -v md5) ]; then
echo 'VERSION = "'`md5 -q www_static/frontend.html`'"' >> frontend.py
elif [ $(command -v md5sum) ]; then
echo 'VERSION = "'`md5sum www_static/frontend.html | cut -c-32`'"' >> frontend.py
else
echo 'Could not find a MD5 utility'
fi

0 comments on commit 4d0bd03

Please sign in to comment.