Skip to content

Conversation

@lucasnz
Copy link
Collaborator

@lucasnz lucasnz commented Dec 16, 2024

I need to check I've correctly resolved the merge conflicts, but once I have we should merge this into master. I'll check it again tomorrow, as I don't want to break master...

JonathanGiles and others added 30 commits December 10, 2024 10:54
The changes to WebUI.cpp are in the Firmware-Updates branch and are
dependent on other changes in that branch. In particular, the addition
of the HttpContent class.
Moving it /json to after /json/config resolves this
/json/config was hitting /json
I can't get LittleFS to flash OTA.
OTA the file system, then reboot the ESP.
@JonathanGiles JonathanGiles mentioned this pull request Dec 16, 2024
# Conflicts:
#	CHANGELOG.md
#	lib/Config/Config.cpp
#	lib/Config/Config.h
#	lib/WebUI/WebUI.cpp
#	lib/WebUI/WebUI.h
#	src/main.cpp
@lucasnz
Copy link
Collaborator Author

lucasnz commented Dec 16, 2024

I have reviewed this, and it's good to merge, but I'll let @wayne-love decide/review before merging into master.

@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

</div>
</div>

<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>

Check warning

Code scanning / CodeQL

Inclusion of functionality from an untrusted source Medium

Script loaded from content delivery network with no integrity check.
@lucasnz
Copy link
Collaborator Author

lucasnz commented Mar 9, 2025

Update coming soon from me.

@lucasnz lucasnz closed this Mar 9, 2025
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