Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v4.2' into devel

Browse Source 
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
This commit is contained in:
Mcat12
2019-02-03 11:24:19 -08:00
parent a2615c8c00 f2b2aa42c0
commit 2ba8787261
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/pi-hole/js/db_graph.js
View File

@@ -23,6 +23,7 @@ $(function () {
{
timePicker: true, timePickerIncrement: 15,
locale: { format: dateformat },
startDate: start__, endDate: end__,
ranges: {
"Today": [moment().startOf("day"), moment()],
"Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],

1
scripts/pi-hole/js/db_lists.js
View File

@@ -24,6 +24,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")],

1
scripts/pi-hole/js/db_queries.js
View File

@@ -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")],

2
scripts/pi-hole/js/queries.js
View File

@@ -170,7 +170,7 @@ $(document).ready(function() {
dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
break;
case "5":
dnssec_status = "<br><span style=\"color:red\">?</span>";
dnssec_status = "<br><span style=\"color:red\">UNKNOWN</span>";
break;
default: // No DNSSEC
dnssec_status = "";

5
scripts/pi-hole/php/savesettings.php
View File

@@ -578,6 +578,11 @@ function readAdlists()
$error .= "Static release for MAC address (".htmlspecialchars($mac).") already defined!<br>";
break;
}
if($ip !== "noip" && $lease["IP"] === $ip)
{
$error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!<br>";
break;
}
}
if(!strlen($error))