Commit Graph

1951 Commits

Author SHA1 Message Date
Johannes
600c447136 sync 2022-05-06 18:20:27 +02:00
joBr99
7bb069d1e2 sync (add nextion2text) 2022-05-06 16:15:47 +00:00
Johannes
d734adefce sync 2022-05-06 18:15:23 +02:00
Johannes
a633a8e286 sync 2022-05-06 18:13:34 +02:00
joBr99
6f2e6498c0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:09:55 +00:00
Johannes
55c7d6c67f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:09:31 +02:00
Johannes
b3964e8b0d sync media page 2022-05-06 18:09:23 +02:00
joBr99
c7255e0b5e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:05:12 +00:00
Johannes
b309881487 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:04:47 +02:00
Johannes
2542a1e40f sync cardAlarm 2022-05-06 18:04:41 +02:00
joBr99
12114e560a Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:01:54 +00:00
Johannes
ed65bcf961 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:01:26 +02:00
Johannes
f646c24641 add localizationto popup pages 2022-05-06 18:01:11 +02:00
joBr99
eb1f4779f2 Merge pull request #179 from jmbinette/main (add nextion2text) 2022-05-06 15:56:24 +00:00
Johannes
8c1e1817e3 Merge pull request #179 from jmbinette/main
US-P Update
2022-05-06 17:56:04 +02:00
Johannes
319a2a429c Merge branch 'main' into pr/179 2022-05-06 17:55:39 +02:00
joBr99
e0ed65ea50 Merge branch 'main' into pr/179 (add nextion2text) 2022-05-06 15:52:05 +00:00
Johannes
57a3984de3 Merge branch 'main' into pr/179 2022-05-06 17:51:23 +02:00
joBr99
cff204b38e merge cardThermo into PR (add nextion2text) 2022-05-06 15:50:20 +00:00
Johannes
f3948d86c2 merge cardThermo into PR 2022-05-06 17:49:51 +02:00
joBr99
ac23ed80ea Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 15:41:34 +00:00
Johannes
40b46f02c7 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 17:41:11 +02:00
Johannes
281ea04959 add text for addional info on popupShutter #145 2022-05-06 17:41:02 +02:00
joBr99
ee47d331f1 syned cardThermo (add nextion2text) 2022-05-06 15:23:54 +00:00
Johannes
25c67de9d2 syned cardThermo 2022-05-06 17:23:28 +02:00
joBr99
e0b66e606e synced popupShutter, popupLight and pageIcons (add nextion2text) 2022-05-06 15:18:25 +00:00
Johannes
b932cf5e69 synced popupShutter, popupLight and pageIcons 2022-05-06 17:17:54 +02:00
joBr99
cf5afe3ede synced popup shutter (add nextion2text) 2022-05-06 15:15:13 +00:00
Johannes
fa0e68e68e synced popup shutter 2022-05-06 17:14:46 +02:00
Johannes
5aedd699ec Update README.md 2022-05-06 17:08:16 +02:00
Johannes
8f82d9465f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 17:07:14 +02:00
Johannes
ab3301ffbd implemented fan #175 2022-05-06 17:07:05 +02:00
joBr99
cbb875cc1b Synced US-P (#178) (add nextion2text) 2022-05-06 15:00:34 +00:00
jmbinette
fa24d04c3d Synced US-P (#178)
* synced us-p version

* synced us-p version (add nextion2text)

Co-authored-by: jmbinette <jmbinette@users.noreply.github.com>
2022-05-06 16:59:42 +02:00
jmbinette
8718f80c9a synced us-p version (add nextion2text) 2022-05-06 14:54:03 +00:00
jmbinette
8375ae9682 synced us-p version 2022-05-06 10:53:22 -04:00
joBr99
058bc25b82 fixed some more crcs (add nextion2text) 2022-05-06 14:02:55 +00:00
Johannes
c3c02f584b fixed some more crcs 2022-05-06 16:02:29 +02:00
Johannes
e0427db2f1 fixed some more crcs 2022-05-06 16:01:59 +02:00
joBr99
48d540dd78 sync entn length (add nextion2text) 2022-05-06 13:57:22 +00:00
Johannes
77a9d38db7 sync entn length 2022-05-06 15:56:57 +02:00
joBr99
e830b46b49 fix some of the crc erros in us-p version (add nextion2text) 2022-05-06 13:54:07 +00:00
Johannes
f5345c5d2a fix some of the crc erros in us-p version 2022-05-06 15:53:43 +02:00
Johannes
41662984f4 Update README.md 2022-05-06 15:46:04 +02:00
Johannes
d6ecb04c87 fix lock button text 2022-05-06 15:40:56 +02:00
Johannes
ded9bebd4c added color for lock 2022-05-06 07:16:25 +00:00
Johannes
6b695106a5 add lock to controller 2022-05-06 09:08:03 +02:00
Johannes
16e70c390a add lock to pages.py 2022-05-06 09:03:40 +02:00
Johannes
73c06a742e fixed stats for lock icon 2022-05-06 08:47:43 +02:00
Johannes
27f8143a63 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 08:46:03 +02:00