Merge remote-tracking branch 'origin/main'

# Conflicts:
#	core/constants.py
#	pyproject.toml
#	templates/add_spot.html
#	templates/alerts.html
#	templates/bands.html
#	templates/base.html
#	templates/conditions.html
#	templates/map.html
#	templates/spots.html
#	templates/status.html
This commit is contained in:
Ian Renton
2026-08-28 15:46:24 +01:00
29 changed files with 80 additions and 63 deletions
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1787928232" type="text/css">
<link rel="stylesheet" href="/static/css/style.css?v=1787928385" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -15,10 +15,10 @@
window.fetchEventSource = fetchEventSource;
</script>
<script src="/static/js/utils.js?v=1787928232"></script>
<script src="/static/js/ui-ham.js?v=1787928232"></script>
<script src="/static/js/geo.js?v=1787928232"></script>
<script src="/static/js/common.js?v=1787928232"></script>
<script src="/static/js/utils.js?v=1787928385"></script>
<script src="/static/js/ui-ham.js?v=1787928385"></script>
<script src="/static/js/geo.js?v=1787928385"></script>
<script src="/static/js/common.js?v=1787928385"></script>
{% end %}
{% block body %}
<div class="container">