Merge branch 'release/v4.2' into devel

# Conflicts: # scripts/pi-hole/js/db_graph.js
2025-12-23 20:28:28 +00:00 · 2019-02-03 11:24:19 -08:00
parent a2615c8c00 f2b2aa42c0
commit 2ba8787261
5 changed files with 9 additions and 1 deletions
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -38,6 +38,7 @@ $(function () {
    {
      timePicker: true, timePickerIncrement: 15,
      locale: { format: "MMMM Do YYYY, HH:mm" },
+      startDate: start__, endDate: end__,
      ranges: {
        "Today": [moment().startOf("day"), moment()],
        "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],