Upstream/esphome-docs
1
0
Fork 0
mirror of https://github.com/esphome/esphome-docs.git synced 2024-12-26 17:27:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'current' into next

Browse Source
This commit is contained in:
Jesse Hills 2021-07-30 10:59:59 +12:00
commit def8aff094
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doxygen
View File

@ -38,15 +38,7 @@ PROJECT_NAME = "ESPHome"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
<<<<<<< HEAD
<<<<<<< HEAD
PROJECT_NUMBER = 1.21.0-dev PROJECT_NUMBER = 1.21.0-dev
=======
PROJECT_NUMBER = 1.20.0
>>>>>>> current
=======
PROJECT_NUMBER = 1.20.1
>>>>>>> current
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

2
Makefile
View File

@ -1,5 +1,5 @@
ESPHOME_PATH = ../esphome ESPHOME_PATH = ../esphome
ESPHOME_REF = v1.20.1 ESPHOME_REF = v1.20.2
.PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png

8
_static/version
View File

@ -1,9 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
1.21.0-dev 1.21.0-dev
=======
1.20.0
>>>>>>> current
=======
1.20.1
>>>>>>> current

8
changelog/v1.20.0.rst
View File

@ -79,6 +79,14 @@ Release 1.20.1 - July 27
- Couple more updates for the Tuya component :esphomepr:`2065` by :ghuser:`nuttytree` - Couple more updates for the Tuya component :esphomepr:`2065` by :ghuser:`nuttytree`
- Fix MQTT climate custom fan modes without regular ones :esphomepr:`2071` by :ghuser:`OttoWinter` - Fix MQTT climate custom fan modes without regular ones :esphomepr:`2071` by :ghuser:`OttoWinter`
Release 1.20.2 - July 29
------------------------
- More Tuya MCU robustness :esphomepr:`2080` by :ghuser:`jkl1337`
- Bump esphome dashboard to 20210728.0 :esphomepr:`2081` by :ghuser:`jesserockz`
- HLW8012 - Dump energy sensor config :esphomepr:`2082` by :ghuser:`jesserockz`
- Use sensor_schema for total_daily_energy :esphomepr:`2090` by :ghuser:`jesserockz`
Full list of changes Full list of changes
-------------------- --------------------

3
guides/supporters.rst
View File

@ -292,6 +292,7 @@ Contributors
- `Jim Bauwens (@jimbauwens) <https://github.com/jimbauwens>`__ - `Jim Bauwens (@jimbauwens) <https://github.com/jimbauwens>`__
- `Jérémy JOURDIN (@JJK801) <https://github.com/JJK801>`__ - `Jérémy JOURDIN (@JJK801) <https://github.com/JJK801>`__
- `Jonathan Jefferies (@jjok) <https://github.com/jjok>`__ - `Jonathan Jefferies (@jjok) <https://github.com/jjok>`__
- `John K. Luebs (@jkl1337) <https://github.com/jkl1337>`__
- `Justin Maxwell (@jkmaxwell) <https://github.com/jkmaxwell>`__ - `Justin Maxwell (@jkmaxwell) <https://github.com/jkmaxwell>`__
- `Jeppe Ladefoged (@jladefoged) <https://github.com/jladefoged>`__ - `Jeppe Ladefoged (@jladefoged) <https://github.com/jladefoged>`__
- `Jonathan Martens (@jmartens) <https://github.com/jmartens>`__ - `Jonathan Martens (@jmartens) <https://github.com/jmartens>`__
@ -658,4 +659,4 @@ Contributors
- `San (@zhujunsan) <https://github.com/zhujunsan>`__ - `San (@zhujunsan) <https://github.com/zhujunsan>`__
- `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__ - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
*This page was last updated July 27, 2021.* *This page was last updated July 29, 2021.*