Repository navigation
Resolve merge conflict for tag 0.317.0.0 - #135
Merged
Merged
Conversation
Resolve merge conflict for tag 0.207.3.0
This reverts commit 4201e8f.
…260911 # Conflicts: # .github/workflows/claude-issue-agent-run.yml
Nightly: resolve upstream merge conflict (2026-09-11)
…260913 # Conflicts: # core/site.go # core/site_optimizer_test.go
Nightly: resolve upstream merge conflict (2026-09-13)
…260914 # Conflicts: # .github/workflows/default.yml
The upstream merge pulled in upstream's depot-based sharded integration CI (depot-ubuntu-24.04-arm-32), which the fork has no runners for, so the Integration jobs sat queued forever. Restore fork master's ubuntu runners. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Nightly: resolve upstream merge conflict (2026-09-14)
…260915 # Conflicts: # core/site_optimizer.go
Nightly: resolve upstream merge conflict (2026-09-15)
…260917 # Conflicts: # assets/js/types/evcc.ts # core/site_optimizer.go
Nightly: resolve upstream merge conflict (2026-09-17)
…260920 # Conflicts: # .github/workflows/claude-issue-agent-run.yml # .github/workflows/claude-issue-agent.yml
…de gating Upstream's per-device battery modes now gate grid-discharge (not just grid- charge); TestBatteryRequestDischargeToGrid's mock returned no modes, so it silently broke under the new gating after the merge.
Nightly: resolve upstream merge conflict (2026-09-20)
…260929 # Conflicts: # assets/js/components/Battery/BatteryConfigCard.vue # server/http.go
…outSocLimiter Same upstream-test/fork-signature mismatch as on the tag-0.316.1 release line; now arriving via master's nightly sync for the first time.
Nightly: resolve upstream merge conflict (2026-09-29)
…261001 # Conflicts: # .github/workflows/claude-code-review-run.yml # .github/workflows/claude-issue-agent-run.yml # .github/workflows/claude-issue-agent.yml # .github/workflows/nightly.yml # .github/workflows/release.yml
Nightly: resolve upstream merge conflict (2026-10-01)
…261003 # Conflicts: # .github/workflows/claude-issue-agent-run.yml # .github/workflows/claude-issue-agent.yml
Nightly: resolve upstream merge conflict (2026-10-03)
…261004 # Conflicts: # .github/workflows/claude-code-review-run.yml # .github/workflows/claude-code-review.yml # .github/workflows/claude-issue-agent-run.yml # .github/workflows/claude-issue-agent.yml # .github/workflows/default.yml # .github/workflows/docs-issue.yml # .github/workflows/documentation.yml # .github/workflows/nightly.yml # .github/workflows/release.yml
Nightly: resolve upstream merge conflict (2026-10-04)
The battery settings moved from BatteryExperimental.vue into the Battery.vue view, but the optimizer bindings were not carried over. BatteryConfigCard therefore always saw the prop defaults: - batteryOptimizerSocGoals stayed [], so the reserve goal list never rendered - "add repeating plan" POSTed a goal but nothing appeared, and each click replaced the previous (invisible) goal instead of appending - optimizerManualPA stayed null, so the manual p_a switch and value reset on every page load - currency stayed EUR, so the p_a unit was wrong for other currencies Bind all three, with the fallbacks in computed properties - template expressions cannot reach the CURRENCY import in an options-API component. Reuse the new currency computed in the two smart-limit prop builders. Tests: unit test asserting the view hands the state through to the card, plus e2e coverage for the reserve goal and manual p_a round trips (both fail without the bindings). Co-Authored-By: Claude Opus 4.8
fix(ui): wire optimizer props into the battery view
…261009 # Conflicts: # core/site_optimizer.go
Nightly: resolve upstream merge conflict (2026-10-09)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A merge conflict was detected while syncing tag 0.317.0.0 (folding master into tag-0.317.0). Please resolve the conflict in this PR.