Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Conflicts:
	homeassistant/bootstrap.py
	homeassistant/components/frontend/version.py
	homeassistant/const.py
pull/1862/head
Paulus Schoutsen 2016-04-19 22:53:26 -07:00
parent 0c58a1a499 3de51bf75d
commit 4abbbf0f50
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,2 +1,2 @@
"""DO NOT MODIFY. Auto-generated by build_frontend script."""
VERSION = "ffd8a1bde5ba13f300c3d6ad32036526"
VERSION = "b9460e6bbf5549236815d94f1c1c98b9"

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

File diff suppressed because one or more lines are too long

4
homeassistant/components/http.py
View File

@ -222,6 +222,10 @@ class RequestHandler(SimpleHTTPRequestHandler):
if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]:
data.pop(DATA_API_PASSWORD, None)
# we really shouldn't need to forward the password from here
if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]:
data.pop(DATA_API_PASSWORD, None)
if '_METHOD' in data:
method = data.pop('_METHOD')