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/v5.2' into new/mac_clients

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-07-30 21:56:21 +02:00
parent a901489a96 0865123914
commit 1b129bcad0
30 changed files with 1169 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/pi-hole/js/network.js
View File

@@ -5,7 +5,7 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
/* global moment:false, utils:false */
/* global utils:false */
var tableApi;
@@ -196,7 +196,7 @@ $(function () {
width: "8%",
render: function (data, type) {
if (type === "display") {
return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");
return utils.datetime(data);
}
return data;
@@ -207,7 +207,7 @@ $(function () {
width: "8%",
render: function (data, type) {
if (type === "display") {
return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");
return utils.datetime(data);
}
return data;