andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,307 Commits 6 Branches 30 Tags
1e529a9e196fff45df861c8f5d00a4113231f3b2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy b0ae22d493 Merge pull request #724 from proddy/dev 
build web i18n on github actions
 2022-11-05 18:02:37 +01:00
Proddy e58491ed97 Merge pull request #722 from MichaelDvP/dev 
Changes in discussion
 2022-11-05 17:52:15 +01:00
Proddy 6883dbbce1 Merge pull request #723 from proddy/dev 
fix to base translations, auto generate i18n
 2022-11-05 14:00:08 +01:00
Proddy 825836c447 Merge pull request #721 from proddy/dev 
formatting, updated packages, fix dialog focus on customization screen
 2022-11-03 22:30:43 +01:00
Proddy 0bc3a3c34e Merge pull request #719 from pswid/dev 
fix to the translation of the webUI in Polish.
 2022-11-03 20:35:08 +01:00
Proddy bdce4ee9f9 Merge pull request #718 from MichaelDvP/dev 
fix #717, rounding error
 2022-11-01 18:09:31 +01:00
Proddy 2c056d6807 Merge pull request #715 from proddy/dev 
minor changes
 2022-10-31 20:56:54 +01:00
Proddy 3baedf01d1 Merge pull request #713 from MichaelDvP/dev 
min/max, bus-ids, MD5
 2022-10-31 19:28:54 +01:00
Proddy e45c31345e Merge pull request #712 from proddy/dev 
auto-formatting web code
 2022-10-30 16:56:48 +01:00
Proddy 23cd677133 Merge branch 'emsesp:dev' into dev 2022-10-30 16:56:13 +01:00
Proddy 5199edff1e Merge pull request #711 from proddy/dev 
minor updates
 2022-10-30 16:47:08 +01:00
Proddy 03564b3a82 Merge pull request #708 from mvjt/dev 
Translated new index.ts items to Swedish
 2022-10-30 16:14:13 +01:00
Proddy ed81e095ee Merge pull request #702 from pswid/dev 
The translation of the web interface into Polish has been corrected and completed (e.g. the word order has been fixed).
 2022-10-29 11:03:24 +02:00
Proddy 76734b77f1 Merge pull request #706 from MichaelDvP/dev 
fixes #704 and #698
 2022-10-29 10:56:13 +02:00
Proddy c3cfed5ac3 Merge pull request #700 from proddy/dev 
package update
 2022-10-24 13:30:57 -07:00
Proddy d9bbf35afc Merge pull request #693 from pswid/dev 
Polish translation improvements
 2022-10-24 13:29:11 -07:00
Proddy 8b10970e03 Merge pull request #696 from MichaelDvP/dev 2022-10-18 10:09:48 +02:00
Proddy 26208103fc Merge pull request #694 from MichaelDvP/dev 
DIV10 for solarTemp
 2022-10-17 19:07:25 +02:00
Proddy 5c675c7ce7 Merge pull request #690 from MichaelDvP/dev 
solar temperature sensor and some fixes
 2022-10-17 15:00:47 +02:00
Proddy 52a8c7288d Merge pull request #685 from MichaelDvP/dev 
small fixes
 2022-10-14 16:52:37 +02:00
Proddy e5e058672d Merge pull request #683 from pswid/dev 
Added Polish names of the entities
 2022-10-14 12:08:13 +02:00
Proddy fd2cc8aff1 Merge pull request #684 from proddy/dev 
update standalone build
 2022-10-13 22:07:49 +02:00
Proddy 8d290317d7 Merge pull request #677 from MichaelDvP/dev_ 
C3/S2 support, tags translated
 2022-10-13 21:40:14 +02:00
Proddy b59a552288 Merge pull request #680 from pswid/dev 
Polish translation improvements
 2022-10-11 18:41:15 +02:00
Proddy def67899ed Merge pull request #679 from tefracky/tefracky-german-translation 
Updated German translation
 2022-10-11 18:40:41 +02:00
Proddy 887a245d82 Merge pull request #676 from proddy/dev 
NO and Commands translations
 2022-10-11 08:28:12 +02:00
Proddy 87dfffeddb Merge pull request #672 from proddy/dev 
fix REST-API - strange characters in description
 2022-10-09 19:41:46 +02:00
Proddy fd5fcf356f Merge pull request #667 from ajvdw/dev 
Added support for ESP32-S2
 2022-10-07 21:11:36 +02:00
Proddy 73f7603c1d Merge pull request #668 from MichaelDvP/dev 
Float rendering and Junkers FW500
 2022-10-07 21:05:58 +02:00
Proddy 4489e7149c Merge pull request #664 from MichaelDvP/dev 
add controller BC30, #663
 2022-10-05 18:20:21 +02:00
Proddy 9f5a5108fb Merge pull request #662 from MichaelDvP/dev 
fix #659, mqtt bool values
 2022-10-05 12:09:33 +02:00
Proddy f2f10f0c79 Merge pull request #661 from pswid/dev 
Polish translation improvements
 2022-10-04 21:04:17 +02:00
Proddy 1accdfcafb Merge pull request #660 from MichaelDvP/dev 
Climate min/max #647, RC300 CalIntTemp #657
 2022-10-04 21:01:59 +02:00
Proddy 246684f28c Merge pull request #651 from MichaelDvP/dev 
add missing fahrenheits on customization screen
 2022-10-01 11:59:48 +02:00
Proddy 3bca7c9a13 Merge pull request #650 from MichaelDvP/dev 
custom min/max
 2022-09-28 21:20:08 +02:00
Proddy 01f361e7cd Merge pull request #643 from mvjt/dev 
Polishing Swedish Translations
 2022-09-25 11:46:26 +02:00
Proddy 1278776297 Merge pull request #642 from proddy/dev 
update to commands in web
 2022-09-25 11:46:01 +02:00
Proddy d8144c901d Merge pull request #640 from MichaelDvP/dev 
mqtt ha settings, show memory in KB, etc.
 2022-09-24 17:40:07 +02:00
Proddy 30109a54ce Merge pull request #639 from proddy/dev 
fix missing NL translations
 2022-09-24 16:09:05 +02:00
Proddy 12638275fa Merge pull request #633 from tefracky/pull-request-german-translation 
Fixed German translation typos
 2022-09-22 19:03:36 +05:30
Proddy 25c50435ca Merge pull request #632 from MichaelDvP/dev 
fix #631, negative multiplicator
 2022-09-22 19:03:04 +05:30
Proddy fb998a7e6a Merge pull request #630 from MichaelDvP/dev 2022-09-20 22:23:01 +05:30
Proddy 918c0315eb Merge pull request #627 from MichaelDvP/dev 
Fallback to en on empty entity string
 2022-09-19 22:41:18 +05:30
Proddy 96070d6b42 Merge pull request #626 from MichaelDvP/dev 
Translations, move rf sensor #624
 2022-09-19 19:32:40 +05:30
Proddy 84e7847c16 Merge pull request #620 from CheeseE/dev 
Add support for Lolin C3 mini
 2022-09-19 16:18:34 +05:30
Proddy 506aacbd83 Merge pull request #623 from MichaelDvP/v3.5.0 
disable uncomplete translations
 2022-09-17 10:50:12 -07:00
Proddy 766ec6a6e4 Merge pull request #622 from MichaelDvP/v3.5.0 
add operation sign to log and some other small changes
 2022-09-17 08:09:54 -07:00
Proddy e7cbb8cc77 Merge pull request #617 from MichaelDvP/v3.5.0 
V3.5.0 small updates
 2022-09-11 11:10:19 +01:00
Proddy 70efa4f4e6 Merge pull request #613 from MichaelDvP/dev 
fix #42
 2022-09-09 16:06:04 +01:00
Proddy 763337db3f Merge pull request #603 from MichaelDvP/dev 
AM200, RC100H, etc.
 2022-08-20 09:31:44 +02:00
Proddy 8d3bcde8d6 Merge pull request #589 from ichsteffen/dev 
Update MqttSettingsForm.tsx
 2022-07-30 16:55:36 +02:00
Proddy beae2a2587 Merge pull request #586 from proddy/dev 
link to device entity details
 2022-07-25 19:40:16 +02:00
Proddy d0bcbb8d1b Merge pull request #585 from MichaelDvP/dev 
AM200, EM10 changes
 2022-07-23 14:55:29 +02:00
Proddy 97257ac821 Merge pull request #583 from proddy/dev 
minor changes when testing coldshot
 2022-07-23 13:04:46 +02:00
Proddy 32dcd7313b Merge pull request #579 from proddy/dev 2022-07-21 08:16:48 +02:00
Proddy 69568abb8a Merge pull request #572 from MichaelDvP/dev 
fix automatic build
 2022-07-13 00:26:22 +05:30
Proddy 2fedd6da15 Merge pull request #571 from MichaelDvP/dev 
FS_Buffer to 8k for customizations, fix#570
 2022-07-12 14:36:20 +05:30
Proddy 39feb25600 Merge pull request #568 from proddy/dev 
fix column size for temperature
 2022-07-05 13:12:01 +02:00
Proddy 4e5b460447 Merge pull request #567 from proddy/dev 
update table packages
 2022-07-04 21:43:03 +02:00
Proddy 40fa1d47bc Merge pull request #566 from MichaelDvP/dev 2022-06-30 11:56:58 +02:00
Proddy da596a01b9 Merge pull request #563 from proddy/dev 
optimize for mobile phone layout
 2022-06-26 21:13:16 +02:00
Proddy 42c9aeeed6 Merge pull request #562 from proddy/dev 
fix multiline
 2022-06-25 16:35:05 +02:00
Proddy 84f643e461 Merge pull request #561 from proddy/dev 
table resizing fix
 2022-06-25 14:28:07 +02:00
Proddy 8a05e11297 Merge pull request #560 from pswid/dev 
Shorten "friendly names" in Home Assistant
 2022-06-24 13:59:58 +02:00
Proddy 1fab47acd5 Merge pull request #558 from MichaelDvP/dev 
burner max power to 254%, fix #553
 2022-06-21 10:06:17 +02:00
Proddy 43b1a4572a Merge pull request #557 from MichaelDvP/dev 2022-06-20 22:21:54 +02:00
Proddy 8790d81e03 Merge pull request #556 from MichaelDvP/dev 
fix #554, add dhw vacation/holiday
 2022-06-20 20:16:56 +02:00
Proddy 46c5913000 Merge pull request #552 from proddy/dev 
update packages
 2022-06-17 11:29:50 +02:00
Proddy 449c01d345 Merge pull request #551 from MichaelDvP/dev 
fix #549, set minimum emergencyTemp to 15°C
 2022-06-17 10:59:38 +02:00
Proddy a02d4ab259 Merge pull request #545 from MichaelDvP/dev 
update OneWire lib #542
 2022-06-07 21:19:25 +02:00
Proddy 9524ec1317 Merge pull request #544 from proddy/dev 
minor fixes
 2022-06-06 11:23:23 +02:00
Proddy d162206f75 Merge pull request #540 from MichaelDvP/dev 
WebStatus: add syslog count/fail, show only enabled services
 2022-06-03 16:08:22 +02:00
Proddy 794b3c0471 Merge pull request #538 from MichaelDvP/dev 
fix #536 and uart task priority
 2022-06-03 07:36:49 +02:00
Proddy 41ec4b9bcf Merge pull request #537 from proddy/dev 
update packages
 2022-06-02 14:54:01 +02:00
Proddy 5ef2f8292c Merge pull request #534 from MichaelDvP/dev 
some small corrections
 2022-05-30 12:11:14 +02:00
Proddy 874f686882 Merge pull request #533 from proddy/dev 
chamges for standalone compiling
 2022-05-29 21:16:29 +02:00
Proddy 0b2c95fc4e Merge pull request #532 from MichaelDvP/idf4_no_master 
Update to platformio2.3.0/IDF4/Arduino2.0, remove master themostat
 2022-05-29 20:42:16 +02:00
Proddy fa486c8b60 Merge pull request #520 from tp1de/dev 
Additions for RC310
 2022-05-29 16:28:31 +02:00
Proddy b19b3e5869 Merge branch 'dev' into dev 2022-05-29 16:28:15 +02:00
Proddy e6bfd90235 Merge pull request #531 from proddy/dev 
3.4.2b2
 2022-05-29 16:20:12 +02:00
Proddy e65f5072fe Merge pull request #527 from proddy/dev 
various minor changes, including managing hidden entities in customization screen
 2022-05-29 16:11:53 +02:00
Proddy 9d25f8049c Merge pull request #525 from MichaelDvP/dev 
fixes #522, #523, #524
 2022-05-26 15:17:51 +02:00
Proddy 60714b0b0b Merge pull request #521 from proddy/dev 
React18 modifications
 2022-05-24 22:50:52 +02:00
Proddy 472b97e89e update to 3.4.1b0 2022-05-23 21:34:00 +02:00
Proddy 859c5950f4 Merge pull request #518 from proddy/dev 
autoformatting
 2022-05-23 21:08:31 +02:00
Proddy 7f587070e5 Merge pull request #516 from proddy/dev 
upgrade to react18
 2022-05-23 17:56:59 +02:00
Proddy e121b480ef Merge pull request #515 from tp1de/dev 
emergencyops and emergencytemp for RC310
 2022-05-23 09:22:19 +02:00
Proddy e8387b363f Merge pull request #514 from tp1de/dev 
wwmaxtemp for RC310
 2022-05-21 11:23:13 +02:00
Proddy 6c68f2950a Merge pull request #512 from proddy/dev 
text changes, new screenshots
 2022-05-20 12:48:44 +02:00
Proddy 8fbe2199f4 Merge pull request #510 from tp1de/dev 
New entities for RC310 EMS+ Heating systems
 2022-05-20 12:35:03 +02:00
Proddy 62a5254add Merge pull request #506 from MichaelDvP/dev 
summermode for heatpump and HM200 hybridmodule
 2022-05-20 10:42:27 +02:00
Proddy ab5ba6fc80 Merge pull request #511 from proddy/dev 
minor updates
 2022-05-20 09:59:34 +02:00
Proddy 862cc8d982 Merge pull request #502 from proddy/dev 
#501
 2022-05-16 21:30:40 +02:00
Proddy 1bdaaf0d0e Merge branch 'emsesp:dev' into dev 2022-05-15 10:44:52 +02:00
Proddy ba315f2159 Merge pull request #497 from MichaelDvP/dev 
fix #496, RC30 design temp
 2022-05-14 21:06:39 +02:00
Proddy 7e26c0633a Merge branch 'emsesp:dev' into dev 2022-05-08 20:14:16 +02:00
Proddy 226a557d5c prevent build failing 2022-05-08 20:13:48 +02:00
Proddy 08021138ae Merge branch 'emsesp:dev' into dev 2022-05-08 20:11:32 +02:00
Proddy db8c30ddbb fix for customizations after upload new file 2022-05-08 17:02:38 +02:00
Proddy 0e9202ae4d change to saving customization file after upload 2022-05-08 17:01:38 +02:00