 Proddy
|
1e1dfccbee
|
Merge pull request #2160 from proddy/dev
value_json['%s']['%s'] for Domoticz (to test)
|
2024-10-31 22:29:56 +01:00 |
|
|
Proddy
|
13dfc87c57
|
Merge pull request #2159 from proddy/dev
remove template logic for Domoticz -#2156
|
2024-10-31 12:13:37 +01:00 |
|
|
Proddy
|
30b7b6db34
|
Merge pull request #2158 from MichaelDvP/dev
small fixes, webinterface and log messages
|
2024-10-30 18:12:44 +01:00 |
|
|
Proddy
|
2df67c2d64
|
Merge pull request #2154 from proddy/dev
updates to 3.7.1
|
2024-10-30 18:10:40 +01:00 |
|
|
Proddy
|
4037e1db5a
|
Merge branch 'emsesp:dev' into dev
|
2024-10-30 14:47:30 +01:00 |
|
|
Proddy
|
8bf97c067f
|
Merge pull request #2157 from MichaelDvP/dev
thermostat time #2142, boiler power reduction #2147
|
2024-10-30 14:47:13 +01:00 |
|
|
Proddy
|
fcf8432325
|
Merge pull request #2150 from proddy/dev
minor fixes
|
2024-10-28 11:59:51 +01:00 |
|
|
Proddy
|
65e0ae174a
|
Merge pull request #2146 from proddy/dev
fix sonar warning
|
2024-10-27 14:59:41 +01:00 |
|
|
Proddy
|
5325904050
|
Merge pull request #2145 from proddy/dev
fix lint/codacy warnings
|
2024-10-27 12:21:44 +01:00 |
|
|
Proddy
|
1bb7d2f150
|
Merge pull request #2144 from proddy/dev
v3.7.1
|
2024-10-27 11:45:10 +01:00 |
|
|
Proddy
|
3cd67741d6
|
Merge pull request #2143 from proddy/dev
minor UI changes
|
2024-10-27 10:52:35 +01:00 |
|
|
Proddy
|
d440e6dc9a
|
Merge pull request #2141 from proddy/dev
prepare 3.7.0
|
2024-10-26 20:56:23 +02:00 |
|
|
Proddy
|
76af1b73c1
|
Merge pull request #2139 from MichaelDvP/dev
cz translation #2096, MH210 mapping #2138
|
2024-10-25 18:17:28 +02:00 |
|
|
Proddy
|
b2c5a387bb
|
Merge pull request #2134 from MichaelDvP/dev
16MB partitions
|
2024-10-24 09:25:51 +02:00 |
|
|
Proddy
|
33884a9c94
|
Merge pull request #2133 from proddy/dev
updates
|
2024-10-23 21:23:40 +02:00 |
|
|
Proddy
|
db86c564b3
|
Merge branch 'emsesp:dev' into dev
|
2024-10-23 10:24:12 +02:00 |
|
|
Proddy
|
003ab39c97
|
Merge pull request #2131 from MichaelDvP/dev
update changelog
|
2024-10-23 09:14:02 +02:00 |
|
|
Proddy
|
2d0de0d976
|
Merge branch 'emsesp:dev' into dev
|
2024-10-22 22:08:38 +02:00 |
|
|
Proddy
|
16be0e1cbc
|
Merge pull request #2129 from MichaelDvP/dev
scheduler functions #2115, uptime notset-value #2109, device custom name #2073
|
2024-10-22 22:08:10 +02:00 |
|
|
Proddy
|
68c924427e
|
Merge pull request #2128 from mattreim/dev
i18n fullstops remove
|
2024-10-22 21:55:08 +02:00 |
|
|
Proddy
|
98b544d789
|
Merge pull request #2127 from proddy/dev
bump version to 3.7.0-dev.48
|
2024-10-22 17:36:08 +02:00 |
|
|
Proddy
|
5f018310e3
|
Merge pull request #2126 from proddy/dev
fix version check in Settings page
|
2024-10-22 17:32:53 +02:00 |
|
|
Proddy
|
6094804e5b
|
Merge pull request #2120 from proddy/dev
fix potential buffer overflow
|
2024-10-22 14:14:44 +02:00 |
|
|
Proddy
|
0a062b17da
|
Merge pull request #2117 from proddy/dev
Developer Mode and send EMS Read Commands from WebUI - #2116
|
2024-10-22 13:57:01 +02:00 |
|
|
Proddy
|
a130dabda5
|
Merge pull request #2112 from proddy/dev
update dump/export files
|
2024-10-19 12:15:38 +02:00 |
|
|
Proddy
|
8bab7579ee
|
Merge pull request #2107 from proddy/dev
dont show broken link if IMG cant be found
|
2024-10-17 14:04:19 +02:00 |
|
|
Proddy
|
210637fde3
|
Merge pull request #2106 from proddy/dev
minor cleanup
|
2024-10-17 10:32:11 +02:00 |
|
|
Proddy
|
0292d55ccc
|
Merge branch 'emsesp:dev' into dev
|
2024-10-17 09:17:46 +02:00 |
|
|
Proddy
|
c4f3046167
|
Merge pull request #2105 from proddy/dev
show dashboard nodes when there is data
|
2024-10-17 00:00:21 +02:00 |
|
|
Proddy
|
96d37ea289
|
Merge pull request #2102 from suaveolent/patch-1
|
2024-10-15 19:27:40 +01:00 |
|
|
Proddy
|
9bdebb4960
|
Merge pull request #2100 from MichaelDvP/dev
|
2024-10-15 17:14:25 +01:00 |
|
|
Proddy
|
0f877b67de
|
Merge pull request #2097 from mattreim/dev
Rename from "CUSTOMIZATIONS_HELP_5" and update slovak translation
|
2024-10-14 21:52:28 +01:00 |
|
|
Proddy
|
5f35659fa7
|
Merge pull request #2094 from MichaelDvP/dev
fix empty scheduler on dashboard
|
2024-10-14 18:28:26 +01:00 |
|
|
Proddy
|
f27916274a
|
Merge pull request #2092 from proddy/dev
update version to 3.7.0-dev.45
|
2024-10-14 17:02:00 +01:00 |
|
|
Proddy
|
19d7e8dcd0
|
Merge pull request #2091 from MichaelDvP/dev
S3-Temperature, Thermostat dhw circuits
|
2024-10-14 16:41:52 +01:00 |
|
|
Proddy
|
1435409540
|
Merge pull request #2089 from proddy/ft_dashboard
Ft dashboard - ui changes
|
2024-10-14 00:08:38 +01:00 |
|
|
Proddy
|
ee9682ae0a
|
Merge pull request #7 from MichaelDvP/ft_dashboard
fix uom display for digital_out
|
2024-10-14 00:07:47 +01:00 |
|
|
Proddy
|
00dcdecc30
|
Merge pull request #2083 from proddy/ft_dashboard
Ft dashboard - #1958
|
2024-10-13 18:41:43 +01:00 |
|
|
Proddy
|
e36f6db59d
|
Merge pull request #6 from MichaelDvP/ft_dashboard
small changes, use commands to change dashboard values
|
2024-10-11 20:46:11 +01:00 |
|
|
Proddy
|
60ab5a3e42
|
tidy up device names
continuation from https://github.com/emsesp/EMS-ESP32/issues/2071
|
2024-10-06 09:02:55 +02:00 |
|
|
Proddy
|
95944aa7a6
|
Merge pull request #2070 from proddy/dev
sonar optimizations
|
2024-10-05 19:03:32 +02:00 |
|
|
Proddy
|
1eaa16995b
|
Merge pull request #2066 from proddy/dev
custom support page, action endpoint
|
2024-10-02 13:31:22 +02:00 |
|
|
Proddy
|
2d011a899e
|
Merge branch 'dev' into dev
|
2024-09-29 12:01:40 +02:00 |
|
|
Proddy
|
596872f5aa
|
Merge pull request #2065 from MichaelDvP/dev
fix using NUMOP_MUL50 on webUI #2064, dev41
|
2024-09-29 09:48:24 +02:00 |
|
|
Proddy
|
f096c1b632
|
Merge pull request #2063 from MichaelDvP/dev
fix rendering "-0.x" values (reported on discord)
|
2024-09-28 16:30:22 +02:00 |
|
|
Proddy
|
554425b727
|
Merge pull request #2061 from mattreim/dev
Update German translation
|
2024-09-28 09:44:00 +02:00 |
|
|
Proddy
|
243da8851c
|
Merge pull request #2057 from proddy/dev
fixes #2056
|
2024-09-26 22:25:44 +02:00 |
|
|
Proddy
|
64fbc1e4aa
|
Merge pull request #2055 from proddy/dev
#2054
|
2024-09-26 17:50:44 +02:00 |
|
|
Proddy
|
bf46efd326
|
Merge pull request #2053 from MichaelDvP/dev
fix get attribute for second thermostat #2052
|
2024-09-26 17:27:25 +02:00 |
|
|
Proddy
|
ccd6b132cc
|
Merge pull request #2051 from mattreim/dev
Update ButtonTooltip translation
|
2024-09-26 07:48:40 +02:00 |
|
|
Proddy
|
d60cbc6a02
|
Merge pull request #2050 from MichaelDvP/dev
show emsesp-devices in system info, add common fields to value_info #2033
|
2024-09-25 20:00:34 +02:00 |
|
|
Proddy
|
9ca16bd2c8
|
Merge pull request #2049 from proddy/dev
package updates, python formatting
|
2024-09-25 17:33:36 +02:00 |
|
|
Proddy
|
978799f3a7
|
Merge pull request #2048 from proddy/dev
package updates
|
2024-09-24 09:02:45 +02:00 |
|
|
Proddy
|
a79d176793
|
Merge pull request #2045 from proddy/dev
junkers summertime is DIV2
|
2024-09-23 11:09:08 +02:00 |
|
|
Proddy
|
9787dfc0a0
|
Merge pull request #2043 from MichaelDvP/dev
fix api_data as command data
|
2024-09-22 21:38:05 +02:00 |
|
|
Proddy
|
6e22e69fec
|
Merge pull request #2042 from proddy/dev
update console screenshots
|
2024-09-22 15:11:03 +02:00 |
|
|
Proddy
|
b8c6efffcd
|
Merge pull request #2041 from proddy/dev
fix refreshing Module library
|
2024-09-22 14:30:42 +02:00 |
|
|
Proddy
|
171cbd3bb1
|
Merge branch 'emsesp:dev' into dev
|
2024-09-22 14:18:47 +02:00 |
|
|
Proddy
|
c3aa64227e
|
Merge pull request #2040 from xarbit/update_device_library
Update device library
|
2024-09-22 14:07:10 +02:00 |
|
|
Proddy
|
82502e8222
|
Merge pull request #2037 from mheyse/add-modbus-registers
Modbus: add new entities
|
2024-09-21 23:57:06 +02:00 |
|
|
Proddy
|
c405f5b14f
|
Merge pull request #2036 from MichaelDvP/dev
stack for scheduler 5k
|
2024-09-21 23:52:50 +02:00 |
|
|
Proddy
|
4905047177
|
Merge pull request #2035 from MichaelDvP/dev
some fixes
|
2024-09-21 08:34:27 +02:00 |
|
|
Proddy
|
cf9bd4d824
|
Merge pull request #2032 from proddy/dev
updated README
|
2024-09-20 09:12:03 +02:00 |
|
|
Proddy
|
6c2769fe08
|
Merge pull request #2031 from MichaelDvP/dev
add australian models #2030
|
2024-09-20 08:32:48 +02:00 |
|
|
Proddy
|
e292aa3e77
|
Merge pull request #2029 from proddy/dev
incorporated Michael's changes #2027
|
2024-09-19 18:39:21 +02:00 |
|
|
Proddy
|
384eb9bd1f
|
Merge pull request #2028 from proddy/dev
updated breaking change text
|
2024-09-19 14:50:56 +02:00 |
|
|
Proddy
|
876a45d7a0
|
Merge pull request #2027 from proddy/dev
upgrade to ArduinoJson 7.2
|
2024-09-19 12:17:33 +02:00 |
|
|
Proddy
|
3195f92276
|
Merge pull request #2024 from MichaelDvP/dev
few small changes
|
2024-09-18 09:55:46 +02:00 |
|
|
Proddy
|
c30f821015
|
Merge pull request #2023 from proddy/dev
remove is_cmd from dump_telegrams
|
2024-09-17 16:02:29 +02:00 |
|
|
Proddy
|
fc163cc00d
|
Merge pull request #2022 from proddy/dev
remove duplicate ctrl-c prompt in console
|
2024-09-17 14:13:39 +02:00 |
|
|
Proddy
|
9aadedd884
|
Merge branch 'emsesp:dev' into dev
|
2024-09-17 14:13:16 +02:00 |
|
|
Proddy
|
09753421d9
|
Merge pull request #2021 from proddy/dev
ipv6, comments, fix dumps
|
2024-09-17 11:21:38 +02:00 |
|
|
Proddy
|
1263df39ef
|
Merge pull request #2019 from mattreim/dev
Update locale_translations.h
|
2024-09-16 23:43:17 +02:00 |
|
|
Proddy
|
01e79aee4c
|
Merge pull request #2018 from proddy/dev
network
|
2024-09-16 20:59:23 +02:00 |
|
|
Proddy
|
4a16af08b5
|
Merge branch 'emsesp:dev' into dev
|
2024-09-16 15:58:18 +02:00 |
|
|
Proddy
|
856f95769d
|
Merge pull request #2017 from MichaelDvP/dev
fix for #2001 and #2011
|
2024-09-16 15:58:05 +02:00 |
|
|
Proddy
|
3e9b18222b
|
Merge pull request #2015 from mattreim/dev
Update locale_translations.h
|
2024-09-15 16:53:23 +02:00 |
|
|
Proddy
|
865cd634f8
|
Merge pull request #2014 from proddy/dev
small changes
|
2024-09-15 12:35:18 +02:00 |
|
|
Proddy
|
2e4a2952f7
|
Merge pull request #2013 from mattreim/dev
Update locale_translations.h
|
2024-09-15 09:24:57 +02:00 |
|
|
Proddy
|
1757f67bbc
|
Merge pull request #2012 from mattreim/dev
Update locale_translations.h
|
2024-09-14 14:56:17 +02:00 |
|
|
Proddy
|
c73ac6cca9
|
Merge pull request #2010 from proddy/dev
update doc in prep for 3.7.0 release
|
2024-09-13 11:14:20 +02:00 |
|
|
Proddy
|
6b372402f6
|
Merge pull request #2009 from proddy/dev
merge endpoints
|
2024-09-13 10:06:29 +02:00 |
|
|
Proddy
|
f0ff51af25
|
Merge pull request #2006 from proddy/dev
fix typos, optimize web log
|
2024-09-12 18:14:10 +02:00 |
|
|
Proddy
|
ddd2083de8
|
Merge branch 'emsesp:dev' into dev
|
2024-09-12 17:50:49 +02:00 |
|
|
Proddy
|
a417cf7136
|
Merge pull request #2008 from mattreim/dev
Update German translation
|
2024-09-12 17:50:32 +02:00 |
|
|
Proddy
|
8858820630
|
Merge branch 'emsesp:dev' into dev
|
2024-09-12 08:43:32 +02:00 |
|
|
Proddy
|
0572968530
|
Merge pull request #2007 from mattreim/dev
Update German translation[corrections]
|
2024-09-12 08:43:14 +02:00 |
|
|
Proddy
|
86597e0ee0
|
Merge branch 'emsesp:dev' into dev
|
2024-09-11 22:57:21 +02:00 |
|
|
Proddy
|
ee355f44d7
|
Merge pull request #2005 from mattreim/dev
Update German translation
|
2024-09-11 22:57:05 +02:00 |
|
|
Proddy
|
694f1f01d9
|
Merge pull request #1991 from proddy/dev
some minor fixes
|
2024-09-11 15:04:15 +02:00 |
|
|
Proddy
|
9ba9ffcdf9
|
Merge branch 'dev' into dev
|
2024-09-11 15:03:03 +02:00 |
|
|
Proddy
|
837bdf37e7
|
Merge pull request #2000 from mattreim/dev
Add Slovak(SoftVienka) & German translation to locale_translations/i18n
|
2024-09-11 14:51:29 +02:00 |
|
|
Proddy
|
532e36a9b0
|
Merge branch 'emsesp:dev' into dev
|
2024-09-10 15:27:16 +02:00 |
|
|
Proddy
|
fc5b0c762f
|
Merge pull request #1998 from mattreim/dev
Update locale_translations.h
|
2024-09-10 14:02:59 +02:00 |
|
|
Proddy
|
bb2ffca295
|
Merge branch 'emsesp:dev' into dev
|
2024-09-10 08:03:56 +02:00 |
|
|
Proddy
|
e1cbe557d2
|
Merge pull request #1995 from mattreim/dev
|
2024-09-09 22:18:42 +02:00 |
|
|
Proddy
|
716d249719
|
Merge branch 'emsesp:dev' into dev
|
2024-09-09 21:23:54 +02:00 |
|
|
Proddy
|
a7c7fc31b5
|
Merge pull request #1994 from mattreim/dev
Update locale_translations.h
|
2024-09-09 21:23:32 +02:00 |
|
|
Proddy
|
5b8d0b9dda
|
Merge branch 'emsesp:dev' into dev
|
2024-09-09 06:44:55 +02:00 |
|
|
Proddy
|
03a607fe83
|
Merge pull request #1992 from mattreim/dev
Update locale_translations.h
|
2024-09-09 06:44:37 +02:00 |
|