 Proddy
|
8c424c7a64
|
Merge pull request #2283 from misa1515/patch-15
Update locale_translations.h
|
2024-12-12 22:35:27 +01:00 |
|
|
Proddy
|
c2fc771756
|
Merge pull request #2280 from MichaelDvP/dev
small fixes and changes
|
2024-12-06 08:37:49 +01:00 |
|
|
Proddy
|
473cf7c8af
|
Merge pull request #2275 from proddy/dev
minor updates
|
2024-12-02 22:12:29 +01:00 |
|
|
Proddy
|
e0909df06c
|
Merge branch 'emsesp:dev' into dev
|
2024-12-02 22:11:40 +01:00 |
|
|
Proddy
|
dc6bf883f1
|
Merge pull request #2270 from mkurek/patch-1
Fix typo in polish ventilation translation
|
2024-12-02 21:45:16 +01:00 |
|
|
Proddy
|
ce5edd93b4
|
Merge pull request #2272 from MichaelDvP/dev
heatingtypes #2268, pretty telegram, service commands #2182
|
2024-12-02 21:44:23 +01:00 |
|
|
Proddy
|
76151c4395
|
Merge pull request #2265 from proddy/dev
fixes #2264 - tab links broken
|
2024-11-30 21:29:03 +01:00 |
|
|
Proddy
|
3368f2803c
|
Merge pull request #2260 from proddy/dev
3.7.2-dev
|
2024-11-29 10:33:36 +01:00 |
|
|
Proddy
|
f3873e330d
|
Merge pull request #2259 from proddy/dev
Preparing 3.7.1 release
|
2024-11-29 10:18:41 +01:00 |
|
|
Proddy
|
b7654c7e33
|
Merge pull request #2258 from proddy/dev
minor changes
|
2024-11-28 15:01:36 +01:00 |
|
|
Proddy
|
c0bffe4ccf
|
Merge pull request #2256 from proddy/dev
bump version to test version checker
|
2024-11-28 10:49:14 +01:00 |
|
|
Proddy
|
92c32b1abb
|
Merge branch 'emsesp:dev' into dev
|
2024-11-28 10:48:51 +01:00 |
|
|
Proddy
|
29990001b2
|
Merge pull request #2255 from proddy/dev
refactor version webUI screen, update readme
|
2024-11-27 11:08:01 +01:00 |
|
|
Proddy
|
0850737208
|
Merge pull request #2251 from proddy/dev
show download button instead of dialog
|
2024-11-25 16:53:28 +01:00 |
|
|
Proddy
|
e62bb101e2
|
Merge pull request #2250 from proddy/dev
updated modbus
|
2024-11-25 14:33:54 +01:00 |
|
|
Proddy
|
89ccaf1e26
|
Merge pull request #2249 from MichaelDvP/dev
Fix custom entity factor validator and add entities for #1996
|
2024-11-25 14:29:05 +01:00 |
|
|
Proddy
|
c59657ac3b
|
Merge pull request #2248 from proddy/dev
fix Last Will (LWT) not set on MQTT Connect #2247
|
2024-11-25 11:49:08 +01:00 |
|
|
Proddy
|
a7a3207cca
|
Merge pull request #2244 from proddy/dev
react-router upgrade and more tidy up
|
2024-11-24 13:09:33 +01:00 |
|
|
Proddy
|
aec887373e
|
Merge branch 'emsesp:dev' into dev
|
2024-11-24 11:19:27 +01:00 |
|
|
Proddy
|
4e5ad82cff
|
Merge pull request #2246 from MichaelDvP/dev
fix modbus #2245 and reorder #2220
|
2024-11-24 11:18:22 +01:00 |
|
|
Proddy
|
b1b8a128d5
|
Merge pull request #2241 from proddy/dev
update dump telegrams CSV for Mixer
|
2024-11-22 12:28:00 +01:00 |
|
|
Proddy
|
dbd6d38176
|
Merge pull request #2239 from proddy/dev
version updates in files to 3.7.1
|
2024-11-22 11:45:34 +01:00 |
|
|
Proddy
|
3680fad909
|
Merge pull request #2238 from proddy/dev
comment cleanup
|
2024-11-22 11:08:37 +01:00 |
|
|
Proddy
|
3752247d1c
|
Merge pull request #2237 from proddy/dev
various minor fixes
|
2024-11-21 15:02:27 +01:00 |
|
|
Proddy
|
1255381420
|
Merge pull request #2235 from MichaelDvP/dev
modbus fixes
|
2024-11-21 09:45:06 +01:00 |
|
|
Proddy
|
a8f17ec1b3
|
Merge pull request #2236 from proddy/dev
update CSV files for docs.emsesp.org
|
2024-11-21 09:32:02 +01:00 |
|
|
Proddy
|
9f3d3c7a44
|
Merge pull request #2231 from misa1515/patch-14
|
2024-11-20 11:34:24 +01:00 |
|
|
Proddy
|
269c68b945
|
Merge pull request #2227 from proddy/dev
text updates
|
2024-11-19 20:41:31 +01:00 |
|
|
Proddy
|
0b1f87b6ce
|
Merge pull request #2224 from proddy/dev
fix standalone
|
2024-11-19 09:28:52 +01:00 |
|
|
Proddy
|
b7548476ed
|
Merge pull request #2222 from MichaelDvP/dev
fix #2216, add #2212, #2217
|
2024-11-19 09:08:41 +01:00 |
|
|
Proddy
|
a6b89cee58
|
Merge pull request #2221 from proddy/dev
memory tests
|
2024-11-18 19:35:41 +01:00 |
|
|
Proddy
|
09b8dcdb10
|
Merge pull request #2211 from proddy/dev
use new URLs for emsesp.org
|
2024-11-16 15:23:08 +01:00 |
|
|
Proddy
|
da77d52585
|
Merge pull request #2208 from proddy/dev
Wifi Reconnect #2207
|
2024-11-16 14:57:10 +01:00 |
|
|
Proddy
|
4173d4d42a
|
Merge branch 'emsesp:dev' into dev
|
2024-11-16 10:37:51 +01:00 |
|
|
Proddy
|
402f5600d3
|
Merge pull request #2210 from vmonkey/patch-4
Update CZ translation
|
2024-11-16 10:37:39 +01:00 |
|
|
Proddy
|
0a46bcc14f
|
Merge pull request #2205 from mattreim/dev
|
2024-11-15 09:34:39 +01:00 |
|
|
Proddy
|
a33d116bf2
|
Merge pull request #2203 from proddy/dev
use translations for version types
|
2024-11-14 21:15:44 +01:00 |
|
|
Proddy
|
fdc3b19170
|
Merge pull request #2202 from MichaelDvP/dev
fix analog input pullup and counter on gpio 25/26, dac values on web #2201
|
2024-11-14 20:37:56 +01:00 |
|
|
Proddy
|
bf21097745
|
Merge pull request #2199 from MichaelDvP/dev
fixes and additions for #2188, #2198, 2192, #2192, #2132
|
2024-11-14 15:06:10 +01:00 |
|
|
Proddy
|
9b91faba10
|
Merge pull request #2196 from misa1515/patch-13
Update locale_translations.h
|
2024-11-11 06:56:25 +01:00 |
|
|
Proddy
|
68fceaab87
|
Merge pull request #2195 from proddy/dev
improve Version checking
|
2024-11-10 16:56:06 +01:00 |
|
|
Proddy
|
77330c99f4
|
Merge pull request #2187 from proddy/dev
fix lint warnings
|
2024-11-07 12:17:33 +01:00 |
|
|
Proddy
|
fc53917512
|
Merge pull request #2185 from proddy/dev
mainly MQTT fixes for Domoticz
|
2024-11-07 09:19:14 +01:00 |
|
|
Proddy
|
9689f0a7da
|
Merge pull request #2178 from MichaelDvP/dev
add commands for shower, small fixes
|
2024-11-06 08:50:11 +01:00 |
|
|
Proddy
|
94f822d39f
|
Merge pull request #2175 from vmonkey/patch-3
Update web CZ translations
|
2024-11-04 14:05:26 +01:00 |
|
|
Proddy
|
ea4c1f92d3
|
Merge pull request #2176 from proddy/dev
use msgpack content-type - #2166
|
2024-11-04 12:00:25 +01:00 |
|
|
Proddy
|
993fa9fead
|
Merge branch 'emsesp:dev' into dev
|
2024-11-03 23:41:21 +01:00 |
|
|
Proddy
|
bab44d58ff
|
Merge pull request #2172 from vmonkey/patch-1
Update CZ translation
|
2024-11-03 23:40:57 +01:00 |
|
|
Proddy
|
5bfb65fa91
|
Merge pull request #2173 from vmonkey/patch-2
Update CZ translation (web)
|
2024-11-03 23:40:41 +01:00 |
|
|
Proddy
|
df75e86bf4
|
Merge pull request #2163 from proddy/dev
add uom back for Domoticz
|
2024-11-01 13:05:03 +01:00 |
|
|
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 |
|