Skip to content

Fix thermostat#1233

Closed
jgaalen wants to merge 1 commit into
Dashticz:masterfrom
jgaalen:fix-thermostat
Closed

Fix thermostat#1233
jgaalen wants to merge 1 commit into
Dashticz:masterfrom
jgaalen:fix-thermostat

Conversation

@jgaalen

@jgaalen jgaalen commented Jan 2, 2026

Copy link
Copy Markdown

Thermostat could be an issue due to ad blockers. Renamed to tempcontrol.js and it's working out well. Also +/- buttons do work

@MadPatrick

Copy link
Copy Markdown

tested and confirmed it is working
I used the forked version instead of copying the changed files

@MadPatrick

Copy link
Copy Markdown

seems not to be working with the beta branch

@jgaalen

jgaalen commented Jan 2, 2026

Copy link
Copy Markdown
Author

Not using the beta. Have you merged the changes to the beta version? On my side, the problem was due to thermostat.js being blocked by the browser

@MadPatrick

Copy link
Copy Markdown

Yes. I copied the 3 .js files over the exisiting in my folder with the beta branch
Then it is not working.

When i use your branch it is working

@lokonli

lokonli commented Jan 13, 2026

Copy link
Copy Markdown
Collaborator

Thanks for your contribution!

The way of working is to fork the beta branch, create a new branch, commit the changes, and create a PR to merge the changes into the beta branch.
Then I bundle some changes to create a new master.
Also see:
https://dashticz.readthedocs.io/en/master/develop/code.html#github-workflow

Your PR is derived from master, so that will give some issues. Unfortunately I've limited time to fix this for you.

So could you rebase your changes on top of the beta branch and create a new PR, then I can merge it into beta without too much effort.

@MadPatrick

Copy link
Copy Markdown

it is working with the main branch, but breaks the beta branch
Tested it a few time with a new install from main branch and updated to beta.

@jgaalen

jgaalen commented Jan 26, 2026

Copy link
Copy Markdown
Author

#1237

this is what you wanted?

@MadPatrick

Copy link
Copy Markdown

this is also incorporated in #1242

@lokonli

lokonli commented Jul 20, 2026

Copy link
Copy Markdown
Collaborator

Merge in beta already

@lokonli lokonli closed this Jul 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants