Merge branch 'master' into radius-monitoring

openwisp · Apr 2, 2024 · f0535a7 · f0535a7
2 parents 386c307 + 7bc8cb0
commit f0535a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
-FROM python:3.7.5-slim-buster
+FROM python:3.9.19-slim-bullseye
 
 RUN apt update && \
     apt install --yes zlib1g-dev libjpeg-dev gdal-bin libproj-dev \
     libgeos-dev libspatialite-dev libsqlite3-mod-spatialite \
     sqlite3 libsqlite3-dev openssl libssl-dev fping && \
     rm -rf /var/lib/apt/lists/* /root/.cache/pip/* /tmp/*
 
+RUN pip install -U pip setuptools wheel
+
 COPY requirements-test.txt requirements.txt /opt/openwisp/
 RUN pip install -r /opt/openwisp/requirements.txt && \
     pip install -r /opt/openwisp/requirements-test.txt && \

diff --git a/openwisp_monitoring/device/static/monitoring/css/daterangepicker.css b/openwisp_monitoring/device/static/monitoring/css/daterangepicker.css
@@ -389,7 +389,7 @@
 .daterangepicker td.off.start-date,
 .daterangepicker td.off.end-date :hover {
   background-color: #fff;
-  color: #777;
+  color: rgba(119, 119, 119, 0.56);
 }
 .daterangepicker .drp-selected {
   color: #df5d43;

diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,5 @@ openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/ma
 influxdb~=5.3.1
 django-nested-admin~=4.0.2
 netaddr~=0.8.0
-python-dateutil~=2.8.2
+python-dateutil>=2.7.0,<3.0.0
 openwisp-utils[rest] @ https://github.com/openwisp/openwisp-utils/tarball/master
-urllib3~=2.0.3