Repository navigation

Nightly: resolve upstream merge conflict (2026-10-27) - #146

Merged

jeffborg merged 22 commits into

resolve/upstream-20261027

Oct 29, 2026

Merged

Nightly: resolve upstream merge conflict (2026-10-27)#146
jeffborg merged 22 commits into
masterfrom
resolve/upstream-20261027

Commits on Oct 26, 2026
Commits on Oct 27, 2026
- UI: render markdown with marked instead of snarkdown (#35295)
  
  andig
  and
  claude
  authored
  4b02df4
- UI: ignore safe-area insets when embedded in an iframe (#35448)
  naltatis
  authored
  d983b91
- Config/Energyflow: sort consumers alphabetically (#35433)
  naltatis
  authored
  0880587
- Optimizer: don't treat pv battery charging as grid charging (#35428)
  andig
  authored
  2997876
- Kostal Piko MP Plus: cache measurements request (#35404)
  andig
  authored
  9890c9f
- Heating: demand predictor selector in loadpoint settings (#34342)
  
  daniel309
  and
  naltatis
  authored
  927ed3c
Commits on Oct 28, 2026
- Merge remote-tracking branch 'origin/master' into resolve/upstream-20261027
  jeffborg
  committed
  77125c5