Commit Graph

542 Commits

Author SHA1 Message Date
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
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
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
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
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
Mark Drobnak
0f76158129 Merge pull request #653 from ryanknapper/devel
Conditional forwarding options
2018-02-18 12:51:57 -05:00
DL6ER
c62daea621 Remove unnecessary options variable
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-10 16:32:29 +01:00
DL6ER
1db322b963 Show most recent 100 queries instead of queries within most recent 10 minutes
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-10 14:10:55 +01:00
ail1020
78f031869f Display the name of the blocklist URL
added -adlist arg to the query command
2018-01-28 20:17:48 -06:00
Mark Drobnak
041b0550d9 Merge pull request #674 from pi-hole/fix/php-security
Clean up some security issues
2018-01-24 15:12:31 -05:00
Mark Drobnak
63061fa826 Merge pull request #616 from Th3M3/AddToList_Modal
replace Alerts with Modal on queries.php page
2018-01-20 11:12:33 -05:00
Mark Drobnak
5de7202cda Merge pull request #636 from Th3M3/mobile-query-log2
optimize query-log for small screens
2018-01-20 11:04:01 -05:00
Mcat12
289b62abf3 Fix header.php importing func.php twice
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-20 10:59:05 -05:00
Mcat12
862db2ba9e Use hash_equals in password.php (and move it to funcs.php)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 17:52:06 -05:00
Mcat12
a2b30e9fe9 Sanitize debug text before sending
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 17:08:05 -05:00
Mcat12
ad614a2b93 Fix list_verify XSS
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 16:57:47 -05:00
DL6ER
78f6cb3751 Add option to disable logging without flushing logs (for temporary disabling without wanting to nuke the logs).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-18 17:09:20 +01:00
Mark Drobnak
1e96f5d6dd Merge branch 'devel' into mobile-query-log2 2018-01-12 11:03:48 -05:00
Mark Drobnak
690d0a6899 Merge pull request #667 from pi-hole/fix/top-clients-filter
Fix Top Clients filter
2018-01-11 17:30:04 -05:00
Mark Drobnak
1695175dfb Merge pull request #666 from pi-hole/tweak/teleporter-auditlog
Add the audit log to Teleporter
2018-01-11 17:29:04 -05:00
Mark Drobnak
34b6c37516 Fix IP check and allow host names in Top Clients filter
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-11 15:33:31 -05:00
Mark Drobnak
323b3a7a8b Fix Top Clients filter
It expected IP addresses, but only let in domains

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-10 15:56:41 -05:00
Mcat12
a2d9e7c1ac Add auditlog.list to the Teleporter
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-08 22:03:27 -05:00
Mcat12
afe2f73bef Use triple equals in the other places too
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-07 14:20:41 -05:00
Mcat12
322f73fcac Use triple equals
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-07 14:13:57 -05:00
Mcat12
081f0bb98c Add timeout warning to database pages
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-07 14:04:38 -05:00
DL6ER
746df3b63f Decide whether FTL is on any custom branch by looking for "vDev" in the beginning of the version string
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-05 23:19:02 +01:00
Mark Drobnak
f2a0b622f1 Fix preg_split warning
Warning was:
`preg_split(): Delimiter must not be alphanumeric or backslash`

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-02 12:11:22 -05:00
Mark Drobnak
9d37821081 Merge pull request #656 from pi-hole/new/DNSSEC_support
Show DNSSEC result in Query Log (if available)
2017-12-31 11:50:05 -05:00
DL6ER
6500d46289 Unspecified is no error, so make it black
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-31 17:20:41 +01:00
DL6ER
f5930e134c Add ABANDONED result
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-31 17:19:21 +01:00
DL6ER
d9d477f7fb Add "BOGUS" and unknown ("?")
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-31 16:50:31 +01:00
DL6ER
b5adf6d28a Show DNSSEC result in Query Log (if available)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-31 16:41:27 +01:00
DL6ER
bc1f6f9be6 Add quad9 secondary IPv4 server
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-30 18:26:49 +01:00