Commit Graph

1735 Commits

Author SHA1 Message Date
Walter 49190f8a62 Changed indentation from all tabs to all spaces (misread preference, my bad) 2018-05-02 11:07:28 +02:00
Walter 983966da04 Changed indentation from spaces and tabs to only tabs 2018-05-02 11:01:38 +02:00
DL6ER f9d456720f Relax warnings. They are not needed any more.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-29 17:30:42 +02:00
Mark Drobnak 9e8ea2af0d Merge pull request #737 from pi-hole/tweak/forward-dests
Add "blocked" as query answer type and refactor heading of diagram
2018-04-29 11:26:49 -04:00
Florian Ströger 2c7b6c07c6 Added "Raw API Token:"
As requested
2018-04-29 10:17:10 +02:00
DL6ER 5f3f105387 Add frontend changes necessary for https://github.com/pi-hole/FTL/pull/264
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-28 23:09:54 +02:00
Florian Ströger 45fbdae34b Add API Token in Text 2018-04-26 20:04:54 +02:00
Walter 2c2a091b03 Changes concerning the date the gravity list was last changed. Used in the webinterface dashboard as a tooltip, and now also available in the API (both PHP and FTL). Function was moved to new file /scripts/pi-hole/php/gravity.php to keep things neat and to avoid duplicate code. 2018-04-23 20:32:38 +02:00
DL6ER 4c91d65547 Make sure backend does always interpret list of DNS servers even if it is empty
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-19 07:38:34 +02:00
DL6ER 847d6aae53 Improve code as suggested
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 21:49:35 +02:00
DL6ER 7fa6cd85d3 Be less specific, as this feature can be used for any time of local resolver running on a custom port
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:31:16 +02:00
DL6ER f2cefe6ce1 Add frontend changes for supporting a local recursive DNS server
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:11:36 +02:00
DL6ER ef948cfef3 Have to provide all optional arguments in PHP...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 11:23:55 +02:00
DL6ER a1824a45d4 Improve way PHP connects to FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 10:56:52 +02:00
Adam Warner c414a4aba1 Merge branch 'devel' into FTLDNS 2018-04-14 00:53:23 +01:00
Adam Warner b09de8e615 Fix merge conflict
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-14 00:43:27 +01:00
Adam Warner 2be54bc17a Prevent tooltip from being hidden by sidebar 2018-04-14 00:37:04 +01:00
DL6ER 65addb0114 Add cache-control meta tag to reduce problems with stalled browser caches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-08 13:17:06 +02:00
DL6ER 081afa4924 Remove clients over time graph if no data is returned (privacy mode!)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 14:24:59 +02:00
DL6ER 634fa7f2b3 Remove top clients table if no data is returned (privacy mode!)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 14:22:35 +02:00
DL6ER 1055ccf4a3 Add privacy level tab to Settings page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 14:20:19 +02:00
DL6ER ad8228ea34 Merge branch 'devel' into FTLDNS 2018-04-04 12:35:53 +02:00
DL6ER 71a7c84cba Make second argument of resolveHostname() optional
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 12:32:55 +02:00
Mcat12 7244e3a9e0 Don't search for the element by ID when we already have it
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-04-02 17:43:19 -04:00
Mark Drobnak 3b4287a021 Merge pull request #711 from pi-hole/tweak/pie-chart-legends
Add separate legends for pie charts on the dashboard
2018-04-02 16:44:26 -04:00
DL6ER 4cf0f4d6ff Make sure the properties exist when looping over objects
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-02 22:29:38 +02:00
DL6ER e5e956ace6 Automatically detect which _meta to use
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-02 22:07:07 +02:00
DL6ER 8b2e7b89ac Add separate legends for pie charts on the dashboard. Fixes #635
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-02 14:36:21 +02:00
Everett Southwick 5e9c1aec9a Add support for public Cloudflare DNS servers.
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
2018-04-01 18:02:26 -05:00
DL6ER 5e8f4b2584 Merge branch 'devel' into FTLDNS 2018-04-01 16:46:35 +02:00
DL6ER dca374bfcd Simplify NODATA reply type (no need to show A/AAAA here as we show that in the second column) and add reply time if available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-01 16:39:54 +02:00
DL6ER 33cf4f1ce7 Merge pull request #683 from pi-hole/new/queryLog-showlast100
Query Log: Show last 100 queries by default
2018-03-30 22:53:35 +02:00
DL6ER 5aba5a1314 Add missing semicolon
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 18:49:15 +02:00
DL6ER 27d40465cd Use jQuery's .html() routine to overwrite element's content
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 18:48:23 +02:00
DL6ER 7bf5207e06 Fix JS error
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 18:39:03 +02:00
DL6ER 2aca7bf764 customTooltips must be defined before used
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 14:00:02 +02:00
DL6ER 517fa24fe3 Show "N/A" for queries where the reply has not yet reached the Pi-hole
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 13:44:48 +02:00
DL6ER 062ba5141b Strings must use doublequote
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 11:32:36 +02:00
DL6ER 44774d914c We should split the string at ": " instead of at ":" to be fully compatible with IPv6 addresses
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 10:20:26 +02:00
DL6ER e3cd76ad7d Add simple measure to prevent compression of the tooltip at the right edge of the screen (may be improved, not tested on mobile screens)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-20 16:50:53 +01:00
DL6ER b6be5629ac Show only non-zero entries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-20 15:28:39 +01:00
DL6ER a5ca08c84d Add custom tooltip as suggested by user @kh0505 here: https://github.com/pi-hole/AdminLTE/issues/603#issuecomment-373933097
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-20 15:20:09 +01:00
Frode Aannevik 9be0887dac move flip-status-x span element into menu
fix the issue where the span element
is obscuring the Disable/Enable element

fixes: https://github.com/pi-hole/AdminLTE/issues/698

Signed-off-by: Frode Aannevik <frode.aa@gmail.com>
2018-03-18 14:47:46 +01:00
DL6ER c1ffcdd997 Fix resolveHostname() subroutine
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:43:28 +01:00
DL6ER 1ec38e3a79 Don't want IPs in Query Log output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:35:42 +01:00
DL6ER 9e5eba4036 Return both client IP and hostname in clientname string
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-04 21:06:28 +01:00
Mark Drobnak f32de004cb Merge pull request #695 from mrdnomaid/patch-3
Change the whitelist icon in the sidebar
2018-03-02 14:41:21 -05:00
Tom 80a7f91449 Change the whitelist icon in the sidebar 2018-03-02 16:44:22 +00:00
DL6ER ee4e106d83 :codacy:
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:52:40 +01:00
DL6ER 02f14ceb05 Add name resolution capabilites (with caching) for web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:44:01 +01:00