7453 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Proddy	c7d721bb10	Merge pull request #1948 from proddy/dev ... small improvements to upload	2024-08-17 12:40:30 +02:00
Proddy	5de696d7be	Merge branch 'emsesp:dev' into dev	2024-08-17 12:39:58 +02:00
proddy	44477d8fcd	revert github spam	2024-08-17 12:38:19 +02:00
proddy	f576ee4fe6	improvements https://github.com/emsesp/EMS-ESP32/pull/1931#issuecomment-2294803388	2024-08-17 12:37:11 +02:00
proddy	cf949a9c86	formatting	2024-08-17 12:36:22 +02:00
proddy	22ed193609	unused css	2024-08-17 12:36:09 +02:00
proddy	b2bcc67923	typo	2024-08-17 12:36:01 +02:00
proddy	7a1a5aad7e	package update	2024-08-17 12:35:53 +02:00
Proddy	8eb2de5e76	Merge pull request #1941 from proddy/dev ... correct firmware naming #1933	2024-08-16 20:03:09 +02:00
Proddy	32053ad0fd	Merge pull request #1946 from MichaelDvP/dev ... typo	2024-08-16 17:54:01 +02:00
MichaelDvP	6c6461dd9a	typo	2024-08-16 17:42:33 +02:00
Proddy	8975c5fba2	Merge branch 'dev' into dev	2024-08-16 17:06:00 +02:00
proddy	1c86cc6799	remove default board profile from ci_s_4M	2024-08-16 16:52:37 +02:00
Proddy	dc7042c8fa	Merge pull request #1945 from MichaelDvP/dev ... add energy and meter for cooling #1940	2024-08-16 16:49:25 +02:00
MichaelDvP	388245ece9	add energy and meter for cooling #1940	2024-08-16 16:44:36 +02:00
proddy	bc8a840695	fix sonar compile	2024-08-16 16:14:07 +02:00
proddy	1d287b6e20	auto-formatting	2024-08-16 16:13:58 +02:00
Proddy	140aba52d1	Merge pull request #1939 from paludi/patch-1 ... add hint for manual workaround to preserve nrg values to CHANGELOG_LATEST.md	2024-08-16 15:45:03 +02:00
Proddy	d06465132c	Merge pull request #1943 from mattreim/dev ... Add German translation	2024-08-16 15:44:31 +02:00
Proddy	0a1743b99b	Merge branch 'emsesp:dev' into dev	2024-08-16 15:33:49 +02:00
Proddy	a8895290bc	Merge pull request #1942 from MichaelDvP/dev ... some small fixes	2024-08-16 15:33:33 +02:00
mattreim	668334d139	Add German translation	2024-08-16 15:32:40 +02:00
proddy	aa8009019d	ci_s_16M uses Tasmota	2024-08-16 15:29:21 +02:00
MichaelDvP	00e2808afe	use fixed names for energies in nvs #1938	2024-08-16 14:58:58 +02:00
MichaelDvP	68ec48fa80	start scheduler conditions after 1 min	2024-08-16 14:57:29 +02:00
Proddy	2fad0df647	Merge branch 'emsesp:dev' into dev	2024-08-16 14:49:49 +02:00
proddy	bbbea027cb	correct firmware naming #1933	2024-08-16 14:49:05 +02:00
MichaelDvP	ed0fcefc27	Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev	2024-08-16 14:45:21 +02:00
Proddy	1672cc84ef	Merge pull request #1931 from proddy/dev ... Web changes #1920	2024-08-16 13:49:32 +02:00
proddy	5404537da8	move restarting to parent component - #1920	2024-08-16 13:48:28 +02:00
proddy	d3a7ab8fc1	formatting	2024-08-16 13:48:05 +02:00
proddy	1f8c966022	package update	2024-08-16 13:47:38 +02:00
proddy	0ff1de8baa	special functions naming - #1920	2024-08-16 13:47:29 +02:00
proddy	7e0d568a5a	code formatting	2024-08-16 13:47:08 +02:00
proddy	a3f69b64df	fix autorefresh in open dialog - #1920	2024-08-16 13:46:57 +02:00
paludi	10dd117d0f	Update CHANGELOG_LATEST.md ... added hint to manually preserve value of dhw energy (nrgww)	2024-08-16 10:48:04 +02:00
proddy	1a6bfebf9b	check file extension on drag/drop	2024-08-15 21:56:49 +02:00
proddy	500a398dd1	re-arrange application settings page - Updates to webUI #1920	2024-08-15 21:15:51 +02:00
proddy	d4d296a97e	translations for drag&drop	2024-08-15 16:48:24 +02:00
proddy	07507eaeb6	show spinner when waiting for EMS to connect	2024-08-15 16:48:12 +02:00
proddy	b1d5d07cab	reorder upload and download, fix minor issues	2024-08-15 16:23:21 +02:00
proddy	e0765f1c5b	formatting	2024-08-15 12:27:50 +02:00
proddy	817b2d1ad7	add back drag & drop to upload	2024-08-15 12:14:14 +02:00
proddy	4e640a0abe	updates to upload, move mock eventsource server into middleware	2024-08-15 09:59:08 +02:00
MichaelDvP	20b833b4ee	scheduler/mqtt running assync with psram, sync without psram	2024-08-15 07:56:24 +02:00
proddy	5a058746bb	update the upload	2024-08-14 18:53:52 +02:00
MichaelDvP	7dc4dc67f6	don't show factory partiton button if we are in factory	2024-08-13 08:03:22 +02:00
MichaelDvP	9a46db07d1	fix hex buffer length	2024-08-12 12:35:23 +02:00
proddy	d5fec4aec8	psram check #1933	2024-08-12 09:29:56 +02:00
MichaelDvP	b5d964c074	Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev	2024-08-12 09:26:46 +02:00