home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-06 14:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
Paulus Schoutsen
2017-07-29 13:33:15 -07:00
parent 80ab02c3e8 e13fd05e7d
commit 72db28abac
10 changed files with 119 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/device_tracker/ubus.py
View File

@@ -80,7 +80,7 @@ class UbusDeviceScanner(DeviceScanner):
return self.last_results return self.last_results
@_refresh_on_acccess_denied @_refresh_on_acccess_denied
def get_device_name(self, device): def get_device_name(self, mac):
"""Return the name of the given device or None if we don't know.""" """Return the name of the given device or None if we don't know."""
if self.leasefile is None: if self.leasefile is None:
result = _req_json_rpc( result = _req_json_rpc(
@@ -105,7 +105,7 @@ class UbusDeviceScanner(DeviceScanner):
# Error, handled in the _req_json_rpc # Error, handled in the _req_json_rpc
return return
return self.mac2name.get(device.upper(), None) return self.mac2name.get(mac.upper(), None)
@_refresh_on_acccess_denied @_refresh_on_acccess_denied
def _update_info(self): def _update_info(self):

4
homeassistant/components/frontend/version.py
View File

@@ -3,7 +3,7 @@
FINGERPRINTS = { FINGERPRINTS = {
"compatibility.js": "8e4c44b5f4288cc48ec1ba94a9bec812", "compatibility.js": "8e4c44b5f4288cc48ec1ba94a9bec812",
"core.js": "d4a7cb8c80c62b536764e0e81385f6aa", "core.js": "d4a7cb8c80c62b536764e0e81385f6aa",
"frontend.html": "c44e49b9a0d9b9e4a626b7af34ca97d0", "frontend.html": "7d599996578579600f1000d6d25e649d",
"mdi.html": "e91f61a039ed0a9936e7ee5360da3870", "mdi.html": "e91f61a039ed0a9936e7ee5360da3870",
"micromarkdown-js.html": "93b5ec4016f0bba585521cf4d18dec1a", "micromarkdown-js.html": "93b5ec4016f0bba585521cf4d18dec1a",
"panels/ha-panel-automation.html": "1982116c49ad26ee8d89295edc797084", "panels/ha-panel-automation.html": "1982116c49ad26ee8d89295edc797084",
@@ -19,6 +19,6 @@ FINGERPRINTS = {
"panels/ha-panel-kiosk.html": "2ac2df41bd447600692a0054892fc094", "panels/ha-panel-kiosk.html": "2ac2df41bd447600692a0054892fc094",
"panels/ha-panel-logbook.html": "7c45bd41c146ec38b9938b8a5188bb0d", "panels/ha-panel-logbook.html": "7c45bd41c146ec38b9938b8a5188bb0d",
"panels/ha-panel-map.html": "50501cd53eb4304e9e46eb719aa894b7", "panels/ha-panel-map.html": "50501cd53eb4304e9e46eb719aa894b7",
"panels/ha-panel-shopping-list.html": "c04af28c6475b90cbf2cf63ba1b841d0", "panels/ha-panel-shopping-list.html": "1d7126efc9ff9a102df7465d803a11d1",
"panels/ha-panel-zwave.html": "422f95f820f8b6b231265351ffcf4dd1" "panels/ha-panel-zwave.html": "422f95f820f8b6b231265351ffcf4dd1"
} }

2
homeassistant/components/frontend/www_static/frontend.html
View File

File diff suppressed because one or more lines are too long

BIN
homeassistant/components/frontend/www_static/frontend.html.gz
View File

Binary file not shown.

2
homeassistant/components/frontend/www_static/home-assistant-polymer

Submodule homeassistant/components/frontend/www_static/home-assistant-polymer updated: 19b903dfb7...7f6aeaf2a2

112
homeassistant/components/frontend/www_static/panels/ha-panel-shopping-list.html
View File

File diff suppressed because one or more lines are too long

BIN
homeassistant/components/frontend/www_static/panels/ha-panel-shopping-list.html.gz
View File

Binary file not shown.

2
homeassistant/components/frontend/www_static/service_worker.js
View File

File diff suppressed because one or more lines are too long

BIN
homeassistant/components/frontend/www_static/service_worker.js.gz
View File

Binary file not shown.

2
homeassistant/const.py
View File

@@ -2,7 +2,7 @@
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 50 MINOR_VERSION = 50
PATCH_VERSION = '0.dev0' PATCH_VERSION = '0'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 4, 2) REQUIRED_PYTHON_VER = (3, 4, 2)