 Proddy
|
cd2afd02be
|
Merge pull request #1675 from MichaelDvP/dev2
update sk-language
|
2024-03-27 18:59:41 +05:30 |
|
|
Proddy
|
b7b09a8c93
|
Merge pull request #1674 from MichaelDvP/dev2
fix sk-language #1673, update pkg
|
2024-03-27 17:11:03 +05:30 |
|
|
Proddy
|
8ef8eeb9ec
|
Merge pull request #1672 from MichaelDvP/dev2
dev2 3.7.0-test, merge all changes from dev
|
2024-03-24 17:35:09 +01:00 |
|
|
Proddy
|
6cab020241
|
Merge pull request #1670 from proddy/dev
fix minor lint warnings
|
2024-03-24 09:45:53 +01:00 |
|
|
Proddy
|
6905abf9f4
|
Merge pull request #1669 from proddy/dev
sync issues
|
2024-03-23 22:11:15 +01:00 |
|
|
Proddy
|
8a66c056d8
|
Merge branch 'emsesp:dev' into dev
|
2024-03-23 19:24:29 +01:00 |
|
|
Proddy
|
800528f843
|
Merge pull request #1667 from proddy/dev
changes to web layout (status and settings)
|
2024-03-23 19:18:59 +01:00 |
|
|
Proddy
|
a6a60215d4
|
Merge branch 'dev' into dev
|
2024-03-23 19:18:54 +01:00 |
|
|
Proddy
|
2739712c5b
|
Merge pull request #1661 from MichaelDvP/dev
add telnet command to reboot to previous version #1657
|
2024-03-16 08:41:23 +01:00 |
|
|
Proddy
|
2efb9d18c9
|
Merge pull request #1662 from proddy/dev
small regression fixes from the last messy build I created (sorry!)
|
2024-03-13 18:51:50 +01:00 |
|
|
Proddy
|
e00c30cd4f
|
Merge pull request #1658 from proddy/dev
fix broken web - #1656
|
2024-03-12 23:15:14 +01:00 |
|
|
Proddy
|
27aa57da3c
|
Merge pull request #1655 from proddy/dev
fix compiling local test
|
2024-03-10 21:36:55 +01:00 |
|
|
Proddy
|
9ad80fc74d
|
Merge pull request #1653 from MichaelDvP/dev
CW100/RC100 controlmode, fix emsesp#1650
|
2024-03-10 21:17:34 +01:00 |
|
|
Proddy
|
7fc7c24a20
|
Merge pull request #1654 from proddy/dev
cleanup and making asyncWS cleaner
|
2024-03-10 21:17:21 +01:00 |
|
|
Proddy
|
c5f2dba1ef
|
Merge pull request #1651 from proddy/dev
minor text changes
|
2024-03-09 14:52:16 +01:00 |
|
|
Proddy
|
a5ef1d16d5
|
Merge pull request #1649 from proddy/dev
package updates
|
2024-03-09 00:58:53 -08:00 |
|
|
Proddy
|
bb3550810d
|
Merge pull request #1647 from MichaelDvP/dev2
update testbuild to latest dev change
|
2024-03-02 10:54:20 +01:00 |
|
|
Proddy
|
5bdf7978bf
|
Merge pull request #1646 from MichaelDvP/dev
enable IPv6 for tasmota-arduino
|
2024-03-02 10:53:45 +01:00 |
|
|
Proddy
|
8c4fc495a3
|
Merge pull request #1639 from MichaelDvP/dev2
merge dev changes/fixes, new entities, env for N32R8 chip, fix custom board profile on boot
|
2024-02-27 08:26:58 +01:00 |
|
|
Proddy
|
fd1d4b97a0
|
Merge pull request #1638 from MichaelDvP/dev
fix command attribute #1637
|
2024-02-27 08:25:16 +01:00 |
|
|
Proddy
|
1db4a33a1d
|
Merge pull request #1631 from MichaelDvP/dev
small fixes
|
2024-02-24 13:28:50 +01:00 |
|
|
Proddy
|
fb09386c22
|
Merge pull request #1633 from proddy/dev
fix issue with HA, removing availability check for online status as it may not have been published in time
|
2024-02-23 19:43:17 +01:00 |
|
|
Proddy
|
df982e3ea9
|
Merge pull request #1632 from MichaelDvP/dev2
update to all dev changes
|
2024-02-23 19:13:32 +01:00 |
|
|
Proddy
|
c769fd6d2c
|
Merge pull request #1626 from proddy/dev
Expose EMS-ESP commands (like reset) via MQTT Discovery #1605
|
2024-02-22 21:29:21 +01:00 |
|
|
Proddy
|
8ebc552cac
|
Merge pull request #1615 from proddy/dev
fix WiFi TxPower, plus a ton of other refactoring
|
2024-02-14 15:08:04 +01:00 |
|
|
Proddy
|
b454e87405
|
Merge branch 'emsesp:dev' into dev
|
2024-02-11 14:23:24 +01:00 |
|
|
Proddy
|
57296e55f2
|
Merge pull request #1610 from proddy/dev
memory optimizations
|
2024-02-10 16:43:34 +01:00 |
|
|
Proddy
|
738d9b1d94
|
Merge pull request #1608 from xobed/dev
Fix Slovenian -> Slovak
|
2024-02-04 18:20:49 +01:00 |
|
|
Proddy
|
2595b906a5
|
Merge pull request #1606 from proddy/dev
small updates
|
2024-02-04 15:10:06 +01:00 |
|
|
Proddy
|
afc34fc387
|
Merge branch 'emsesp:dev' into dev
|
2024-02-04 10:24:39 +01:00 |
|
|
Proddy
|
45335be4ed
|
Merge pull request #1603 from MichaelDvP/dev
add diff for #1597, fix #1599
|
2024-02-04 10:23:20 +01:00 |
|
|
Proddy
|
56e5e87238
|
Merge branch 'emsesp:dev' into dev
|
2024-01-30 20:54:58 +01:00 |
|
|
Proddy
|
ef47ee62a3
|
Merge pull request #1592 from MichaelDvP/dev2
update dev2 to latest dev changes
|
2024-01-30 20:38:49 +01:00 |
|
|
Proddy
|
a9a2380287
|
Merge pull request #1591 from MichaelDvP/dev
fix #1590 and more checks for device-telegram mapping
|
2024-01-30 19:57:08 +01:00 |
|
|
Proddy
|
ed7ba17bc7
|
Merge pull request #1575 from proddy/dev
small changes, optimizations and fixes
|
2024-01-28 18:30:19 +01:00 |
|
|
Proddy
|
526c36728f
|
Merge branch 'emsesp:dev' into dev
|
2024-01-28 18:29:52 +01:00 |
|
|
Proddy
|
133decf453
|
Merge pull request #1579 from myxor/myxor-patch-2
Add Buderus MX300 Internet Gateway
|
2024-01-24 23:41:48 +01:00 |
|
|
Proddy
|
89da6d5851
|
Merge pull request #1574 from MichaelDvP/dev2
Update dev2 to latest changes of dev
|
2024-01-21 10:18:10 +01:00 |
|
|
Proddy
|
1b27e1fd09
|
Merge pull request #1572 from proddy/dev
update web standalone with variable custom entity
|
2024-01-20 21:00:20 +01:00 |
|
|
Proddy
|
ec411a7dff
|
Merge pull request #1570 from MichaelDvP/dev
custom variables #1423
|
2024-01-20 20:20:34 +01:00 |
|
|
Proddy
|
fd4f649db3
|
Merge pull request #1571 from proddy/dev
minor tweaks
|
2024-01-20 20:18:50 +01:00 |
|
|
Proddy
|
bb5ca8a804
|
Merge pull request #1569 from MichaelDvP/dev
telegram mapping to device, add 0x2CC telegrams
|
2024-01-20 15:13:39 +01:00 |
|
|
Proddy
|
549a0302b7
|
Merge pull request #1568 from MichaelDvP/dev
fix #1565 and workaround for #1564
|
2024-01-20 12:22:31 +01:00 |
|
|
Proddy
|
2b6fd41d5a
|
Merge pull request #1559 from proddy/dev
add tag after fullname instead of before
|
2024-01-17 11:58:55 +01:00 |
|
|
Proddy
|
ded7b547e1
|
Merge pull request #1558 from proddy/dev
renamed Web custom entity TSX class, remove bogus URI handler from Web customization, added icon to Custom table
|
2024-01-14 15:26:14 +01:00 |
|
|
Proddy
|
bbfdb0ff0e
|
Merge pull request #1555 from proddy/dev
routine updates
|
2024-01-13 22:24:02 +01:00 |
|
|
Proddy
|
8c2aba8eb1
|
Merge pull request #1552 from proddy/dev
new 'add' test
|
2024-01-12 08:50:55 +01:00 |
|
|
Proddy
|
1d025d5b97
|
Merge pull request #1548 from proddy/dev
also remove references from JsonObjectConst and JsonArray
|
2024-01-08 11:45:30 +01:00 |
|
|
Proddy
|
1dde495f61
|
Merge pull request #1546 from MichaelDvP/dev
fix typo #1521
|
2024-01-08 11:33:50 +01:00 |
|
|
Proddy
|
c3650817ef
|
Merge pull request #1547 from proddy/dev
remove & reference to JsonVariant (prevent dangling references)
|
2024-01-08 11:33:37 +01:00 |
|
|
Proddy
|
2b03d01a15
|
Merge pull request #1544 from proddy/dev
small changes, but many
|
2024-01-06 18:00:23 +01:00 |
|
|
Proddy
|
778cdaabb6
|
Merge branch 'emsesp:dev' into dev
|
2024-01-06 17:37:49 +01:00 |
|
|
Proddy
|
efa4f80b99
|
Merge pull request #1542 from MichaelDvP/dev
fix #1495 and #1536
|
2024-01-06 17:16:35 +01:00 |
|
|
Proddy
|
f25ab5f293
|
Merge pull request #1543 from MichaelDvP/dev2
Update dev2 to latest changes from dev
|
2024-01-06 17:13:03 +01:00 |
|
|
Proddy
|
f365fe5317
|
Merge pull request #1539 from proddy/dev
ArduinoJson version 7.0.0 - #1538
|
2024-01-05 22:42:20 +01:00 |
|
|
Proddy
|
13a915e1f4
|
Merge pull request #1537 from proddy/dev
fixes #1360 (domoticz) and #1528 (HA dev name)
|
2024-01-04 18:12:43 +01:00 |
|
|
Proddy
|
0fce450418
|
Merge pull request #1530 from proddy/dev
minor changes
|
2023-12-28 14:21:35 +01:00 |
|
|
Proddy
|
62b341a614
|
Merge pull request #1517 from arturzx/dev
fix: Fixed dev section in analog sensor HA discovery
|
2023-12-28 13:56:34 +01:00 |
|
|
Proddy
|
0058632d71
|
Merge pull request #1523 from pswid/dev
Polish translation update
|
2023-12-28 13:53:45 +01:00 |
|
|
Proddy
|
339408e12a
|
Merge pull request #1529 from proddy/dev
fix HA modes from dev2 for #1525
|
2023-12-28 13:41:38 +01:00 |
|
|
Proddy
|
77700c4873
|
Merge pull request #1525 from Bingo2023/dev2
Dev2 - corrected mode control for HA (including translations).
|
2023-12-28 07:48:01 +01:00 |
|
|
Proddy
|
8d33a89e39
|
Merge pull request #1524 from MichaelDvP/dev
add ES79 and fix german translation, fixes #1521, #1522
|
2023-12-22 16:18:04 +01:00 |
|
|
Proddy
|
225e482814
|
Merge pull request #1519 from MichaelDvP/dev_1
compile with tasmota arduino 2.14 and 3.0
|
2023-12-20 22:06:39 +01:00 |
|
|
Proddy
|
08c5fd8f64
|
Merge pull request #1514 from MichaelDvP/dev
ethernet with arduino_3.0, sort translations alphabetical
|
2023-12-18 09:45:38 +01:00 |
|
|
Proddy
|
a28cdaa930
|
Merge pull request #1515 from proddy/dev
add SK entity translations (from Michael)
|
2023-12-18 09:44:25 +01:00 |
|
|
Proddy
|
a01ee4a48d
|
Merge pull request #1513 from proddy/dev
fix SK
|
2023-12-17 09:47:19 +01:00 |
|
|
Proddy
|
abf4eeb39a
|
Merge pull request #1508 from misa1515/patch-8
Update index.ts
|
2023-12-17 09:33:00 +01:00 |
|
|
Proddy
|
40a85634ef
|
Merge pull request #1509 from misa1515/patch-9
Update LayoutAuthMenu.tsx
|
2023-12-17 09:32:31 +01:00 |
|
|
Proddy
|
a5c41a1cd8
|
Merge pull request #1510 from misa1515/patch-10
Update SignIn.tsx
|
2023-12-17 09:32:07 +01:00 |
|
|
Proddy
|
c6668e1d6a
|
Merge pull request #1511 from misa1515/patch-11
Update system.cpp
|
2023-12-17 09:31:38 +01:00 |
|
|
Proddy
|
ef2ed0f4d1
|
Merge pull request #1507 from proddy/dev
add SK
|
2023-12-16 22:40:08 +01:00 |
|
|
Proddy
|
b29c36d01d
|
Merge pull request #1500 from MichaelDvP/dev2
Testbild keep up to date with dev
|
2023-12-13 11:52:18 +01:00 |
|
|
Proddy
|
68cb94547e
|
Merge pull request #1499 from MichaelDvP/dev
latest entities
|
2023-12-13 11:51:58 +01:00 |
|
|
Proddy
|
ac288b794f
|
Merge pull request #1493 from proddy/dev
update standalone server to bun and itty-router, add back router paths, add support download button
|
2023-12-12 22:37:56 +01:00 |
|
|
Proddy
|
d81b833951
|
Merge pull request #1490 from MichaelDvP/dev2
fix RC300 mode, #1488
|
2023-12-08 11:53:36 +01:00 |
|
|
Proddy
|
4008883627
|
Merge pull request #1482 from MichaelDvP/dev2
Testbuild
|
2023-12-04 20:28:49 +01:00 |
|
|
Proddy
|
c9ca395e6d
|
Merge branch 'emsesp:dev' into dev
|
2023-12-04 17:39:07 +01:00 |
|
|
Proddy
|
c3ac215493
|
Merge pull request #1481 from MichaelDvP/dev
add hpMaxPower #1475
|
2023-12-04 17:38:54 +01:00 |
|
|
Proddy
|
9375fb4d2d
|
Merge branch 'emsesp:dev' into dev
|
2023-12-03 21:28:42 +01:00 |
|
|
Proddy
|
f9b8ac6f30
|
Merge pull request #1478 from MichaelDvP/dev
fixes for #1474 and #1477
|
2023-12-03 21:28:23 +01:00 |
|
|
Proddy
|
7efa8ffbe0
|
Merge pull request #1473 from proddy/dev
roll back dom-router changes
|
2023-12-02 11:06:46 +01:00 |
|
|
Proddy
|
85016d6582
|
Merge branch 'emsesp:dev' into dev
|
2023-12-02 11:06:06 +01:00 |
|
|
Proddy
|
c1fa5c42c4
|
Merge pull request #1471 from MichaelDvP/dev
Some new/fixed entities
|
2023-11-29 20:55:14 +01:00 |
|
|
Proddy
|
306baee94d
|
Merge pull request #1470 from proddy/dev
HA don't set entity_category to Diagnostic/Configuration for EMS entities
|
2023-11-28 20:54:20 +01:00 |
|
|
Proddy
|
ba21293c42
|
Merge pull request #1465 from proddy/dev
fix router loops
|
2023-11-26 18:44:35 +01:00 |
|
|
Proddy
|
c81f579464
|
Merge pull request #1464 from MichaelDvP/dev
revert to react-router-dom 6.18.0 to bring blue tab line back
|
2023-11-26 09:58:35 +01:00 |
|
|
Proddy
|
b60127c3ba
|
Merge pull request #1461 from MichaelDvP/dev
revert to react-router-dom 6.19.0 to fix tab-routing-issue
|
2023-11-25 10:08:17 +01:00 |
|
|
Proddy
|
d36246d4d1
|
Merge pull request #1458 from proddy/dev
3.6.5-dev.0
|
2023-11-24 07:41:46 +01:00 |
|
|
Proddy
|
24cca67625
|
Merge pull request #1457 from proddy/dev
update packages
|
2023-11-24 07:28:52 +01:00 |
|
|
Proddy
|
6e08356ff7
|
Merge pull request #1455 from MichaelDvP/dev
fix boiler commands to ems telegrams
|
2023-11-23 19:07:13 +01:00 |
|
|
Proddy
|
01a15a5c85
|
Merge pull request #1451 from MichaelDvP/dev
next fix RC300 mode
|
2023-11-22 08:24:25 +01:00 |
|
|
Proddy
|
5ad03facce
|
Merge pull request #1445 from proddy/dev
patch for 3.6.3 with fixes #1440 #1442
|
2023-11-21 10:43:08 +01:00 |
|
|
Proddy
|
ad3bf294d8
|
Merge branch 'emsesp:dev' into dev
|
2023-11-21 10:42:39 +01:00 |
|
|
Proddy
|
cff5b8c949
|
Merge pull request #1444 from MichaelDvP/dev
set/read thermostat mode for RC100-RC300, fix #1440 and fix #1442
|
2023-11-21 10:33:46 +01:00 |
|
|
Proddy
|
2de855e044
|
Merge pull request #1439 from proddy/dev
prepare another 3.6.3 build with board profile fixed
|
2023-11-19 21:19:10 +01:00 |
|
|
Proddy
|
905b52e39d
|
Merge pull request #1438 from MichaelDvP/dev
fix crash on wrong thermostat mode command (if not using HA)
|
2023-11-18 14:05:54 +01:00 |
|
|
Proddy
|
64d46fe8f7
|
Merge pull request #1437 from proddy/dev
update changelog
|
2023-11-18 13:43:27 +01:00 |
|
|
Proddy
|
873b75240c
|
Merge pull request #1436 from proddy/dev
3.6.4-dev-0
|
2023-11-18 13:38:20 +01:00 |
|
|
Proddy
|
e20434da88
|
Merge pull request #1435 from proddy/dev
prepare for 3.6.3 release
|
2023-11-18 13:19:27 +01:00 |
|
|
Proddy
|
1c3bc98bbb
|
Merge pull request #1434 from proddy/dev
fix web building with vite 5
|
2023-11-17 12:11:28 +01:00 |
|