Merge branch 'main' into 2.0-pre

# Conflicts:
#	core/config.py
#	core/status_reporter.py
#	server/handlers/api/options.py
#	static/js/bands.js
#	static/js/map.js
#	static/js/spots.js
#	templates/status.html
This commit is contained in:
Ian Renton
2026-08-10 18:34:32 +01:00
17 changed files with 31 additions and 41 deletions
+2 -5
View File
@@ -118,11 +118,8 @@
</div>
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/static/js/spotsbandsandmap.js?v=1786175023"></script>
<script src="/static/js/spots.js?v=1786175023"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786338394"></script>
<script src="/static/js/spots.js?v=1786338394"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>