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

Merge branch 'release/v4.3' into fix/query_table_aditional_sorting_by_id

Browse Source
This commit is contained in:
DL6ER
2019-05-05 20:34:27 +02:00
committed by GitHub
parent c4df1bcced 39922e64b6
commit 7afa31c6d1
5 changed files with 2 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ $(document).ready(function() {
{data: "firstSeen", "width" : "8%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");}else{return data;} }},
{data: "lastQuery", "width" : "8%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");}else{return data;} }},
{data: "numQueries", "width" : "9%", "render": $.fn.dataTable.render.text() },
{data: "", "width" : "6%" }
{data: "", "width" : "6%", "orderable" : false }
],
"lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
"stateSave": true,

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

@@ -5,8 +5,6 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
$(function () {
$("[data-mask]").inputmask();
$("[data-static]").on("click", function(){
var row = $(this).closest("tr");
var mac = row.find("#MAC").text();