From 4c55b9c58c6d76580630424a621aed5b2ff6e677 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sun, 26 Jul 2020 22:12:58 +0200 Subject: [PATCH 001/173] Bump version to v1.16.0-dev --- esphome/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/const.py b/esphome/const.py index 57694c4088..b65d0977fd 100644 --- a/esphome/const.py +++ b/esphome/const.py @@ -1,7 +1,7 @@ """Constants used by esphome.""" MAJOR_VERSION = 1 -MINOR_VERSION = 15 +MINOR_VERSION = 16 PATCH_VERSION = '0-dev' __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}' __version__ = f'{__short_version__}.{PATCH_VERSION}' From b9d55fd1edeec443466771aa873d5b3e5996b587 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sun, 26 Jul 2020 22:42:59 +0200 Subject: [PATCH 002/173] Also run CI checks when merging against beta/master --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce6a120f7a..b26f7e2f43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,6 @@ on: branches: [beta, master] pull_request: - # Only run when PR is against dev branch (all PRs should be against dev branch) - # Helps prevent accidentally merging PRs against master branch - branches: [dev] jobs: # A fast overview job that checks only changed files From 27d4b3b8ad51359eeaa00ed9f37d1c88f72cd84d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 11:43:10 +0200 Subject: [PATCH 003/173] Update cryptography requirement from <3,>=2.0.0 to >=2.0.0,<4 (#1206) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Otto Winter --- esphome/components/wifi/wpa2_eap.py | 2 -- requirements_test.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/esphome/components/wifi/wpa2_eap.py b/esphome/components/wifi/wpa2_eap.py index 5b83c59866..8bf50598b0 100644 --- a/esphome/components/wifi/wpa2_eap.py +++ b/esphome/components/wifi/wpa2_eap.py @@ -114,8 +114,6 @@ def _check_private_key_cert_match(key, cert): def validate_eap(value): - validate_cryptography_installed() - if CONF_USERNAME in value: if CONF_IDENTITY not in value: _LOGGER.info("EAP 'identity:' is not set, assuming username.") diff --git a/requirements_test.txt b/requirements_test.txt index 179f683b32..e9846fb29c 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,7 +1,7 @@ pylint==2.5.3 flake8==3.8.3 pillow>4.0.0 -cryptography>=2.0.0,<3 +cryptography>=2.0.0,<4 pexpect==4.8.0 # Unit tests From a1e10f384e41ebc415b99b533306d55e65c34994 Mon Sep 17 00:00:00 2001 From: Guillermo Ruffino Date: Mon, 27 Jul 2020 06:43:51 -0300 Subject: [PATCH 004/173] fix dashboard select drop down (#1205) --- esphome/dashboard/static/css/esphome.css | 5 +++++ esphome/dashboard/static/js/esphome.js | 13 ++++++++++++- esphome/dashboard/templates/index.html | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/esphome/dashboard/static/css/esphome.css b/esphome/dashboard/static/css/esphome.css index db0ac55985..116170f95d 100644 --- a/esphome/dashboard/static/css/esphome.css +++ b/esphome/dashboard/static/css/esphome.css @@ -163,6 +163,11 @@ main { color: black; } +nav { + height: auto; + line-height: normal; +} + .select-port-container { margin-top: 8px; margin-right: 10px; diff --git a/esphome/dashboard/static/js/esphome.js b/esphome/dashboard/static/js/esphome.js index d80e5e4ec9..52dda446ce 100644 --- a/esphome/dashboard/static/js/esphome.js +++ b/esphome/dashboard/static/js/esphome.js @@ -5,6 +5,7 @@ $(document).ready(function () { M.AutoInit(document.body); nodeGrid(); startAceWebsocket(); + fixNavbarHeight(); }); // WebSocket URL Helper @@ -16,6 +17,17 @@ if (loc.protocol === "https:") { } const wsUrl = wsLoc.href; +/** + * Fix NavBar height + */ +const fixNavbarHeight = () => { + const fixFunc = () => { + const sel = $(".select-wrapper"); + $(".navbar-fixed").css("height", (sel.position().top + sel.outerHeight()) + "px"); + } + $(window).resize(fixFunc); + fixFunc(); +} /** * Dashboard Dynamic Grid @@ -1003,4 +1015,3 @@ jQuery.validator.addMethod("nospaces", (value, element) => { jQuery.validator.addMethod("lowercase", (value, element) => { return value === value.toLowerCase(); }, "Name must be all lower case!"); - diff --git a/esphome/dashboard/templates/index.html b/esphome/dashboard/templates/index.html index fa742fd2c6..d7ba9373be 100644 --- a/esphome/dashboard/templates/index.html +++ b/esphome/dashboard/templates/index.html @@ -31,8 +31,8 @@