Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-27 13:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into new/networktable_ip_neigh

Browse Source
This commit is contained in:
DL6ER
2019-06-16 12:28:18 +02:00
parent d2ce57b48b 91c9865b70
commit 9ba59b9ef3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/pi-hole/js/index.js
View File

@@ -261,15 +261,16 @@ function updateClientsOverTime() {
return;
}
// convert received objects to arrays
data.over_time = objectToArray(data.over_time);
// Remove graph if there are no results (e.g. privacy mode enabled)
if(jQuery.isEmptyObject(data.over_time))
{
$("#clients").parent().remove();
return;
}
// convert received objects to arrays
data.over_time = objectToArray(data.over_time);
// remove last data point since it not representative
data.over_time[0].splice(-1,1);
var timestamps = data.over_time[0];

6
settings.php
View File

@@ -868,11 +868,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
determine the names of devices on your local network. As a
result, tables such as Top Clients will only show IP addresses.</p>
<p>One solution for this is to configure Pi-hole to forward these
requests to your home router, but only for devices on your
requests to your DHCP server (most likely your router), but only for devices on your
home network. To configure this we will need to know the IP
address of your router and the name of your local network.</p>
address of your DHCP server and the name of your local network.</p>
<p>Note: The local domain name must match the domain name specified
in your router, likely found within the DHCP settings.</p>
in your DHCP server, likely found within the DHCP settings.</p>
<div class="form-group">
<div class="checkbox">
<label><input type="checkbox" name="conditionalForwarding" value="conditionalForwarding"