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
2,436 Commits 19 Branches 112 Tags
b6be5629ac25fb0ea6bb827a85dafe67fa86d84c
Commit Graph

2436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
b6be5629ac Show only non-zero entries 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-20 15:28:39 +01:00
DL6ER
5e7caa0f0b Move style definition into correct file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-20 15:22:16 +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
Mark Drobnak
fdff41f4d5 Merge pull request #699 from frodeaa/fix-obscured-menu 
move flip-status-x span element into menu
 2018-03-18 20:38:02 -04: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
fc669ac575 Merge pull request #689 from pi-hole/tweak/Wording 
remove blurb about default whitelist items.
 2018-02-24 21:07:59 -05:00
Mark Drobnak
0f76158129 Merge pull request #653 from ryanknapper/devel 
Conditional forwarding options
 2018-02-18 12:51:57 -05:00
DL6ER
82a4244748 Merge pull request #690 from pi-hole/new/DB_resolve_hostnames 
Long-term data: Resolve IPs to host names
 2018-02-18 16:21:08 +01:00
DL6ER
3769069a0a Obtain host names for IP addresses in database. This can also handle cases where we have mixed host names and IP addresses in the result (Pi-hole v3.3+ stores IP addresses in the database, for consistency) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 20:05:33 +01:00
Adam Warner
6ec8dcdc25 remove blurb about default whitelist items. 
No longer needed as we do not whitelist anything

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-02-17 13:17:17 +00:00
DL6ER
bd11857d62 Merge pull request #688 from pi-hole/master 
Git flow Pi-hole web v3.3
 2018-02-15 19:55:54 +01:00
Dan Schaper
e48aa295bd Merge pull request #682 from pi-hole/release/3.3 
Pi-hole web v3.3
v3.3 		2018-02-14 12:50:14 -08:00
Adam Warner
8e160ee743 Merge pull request #686 from FoXFTW/master 
Sort IPs in DHCP Table numerically instead of lexicographically
 2018-02-13 19:31:23 +00:00
FoXFTW
60dde53140 Sort IPs in DHCP Table numerically instead of lexicographically 
Signed-off-by: FoXFTW <hannes@octofox.de>
 2018-02-13 12:54:06 +01:00
DL6ER
ddfc8ff5c4 Merge pull request #684 from pi-hole/tweak/dashboard-top-domains 
Dashboard: Clarify what the left table shows
 2018-02-12 00:40:37 +01:00
DL6ER
86c9b6cb57 Clarify what the left table shows 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-11 17:52:48 +01:00
Mark Drobnak
27dd70a974 Merge pull request #676 from ail1020/patch-1 
Display the name of the blocklist URL
 2018-02-10 21:33:56 -05: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
DL6ER
2fd7f5a85c Merge pull request #622 from mikejkeen/patch-1 
Add DNS.WATCH and Quad9 to DNSSEC compatibility list
 2018-01-28 15:17:47 +01:00
Adam Warner
e3b4554a20 Requested change by @DL6ER 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-28 01:04:07 +00: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
3f4421da4b Use intval() and SQLITE3_INTEGER in api_db.php 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 10:58:41 -05:00
DL6ER
d70e57ec4e Merge pull request #673 from pi-hole/tweak/no-flush 
Add option to disable logging without flushing logs
 2018-01-20 10:50:05 +01: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
f89cbee1aa Fix SQL injections 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-19 17:40:04 -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
DL6ER
c6ff6d2b8a Merge pull request #669 from pi-hole/tweak/lan 
Use "lan" as suggested TLD for DHCP generated domains
 2018-01-17 08:47:03 +01:00
DL6ER
86e4dbec94 Use "lan" as suggested TLD for DHCP generated domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-16 22:12:05 +01:00
Mark Drobnak
5140baa8f5 Merge pull request #668 from hollec/settings_formatting_cleanup 
Clean up formatting in settings page
 2018-01-14 16:46:48 -05:00
ryanknapper
147773c2fb Update settings.php 
Cleaned up the explanation paragraph structure and corrected the project name.
 2018-01-14 12:47:24 -05:00
Chris Hollenbeck
a5cd0d193e Clean up formatting in settings page 
Signed-off-by: Chris Hollenbeck <1334439+hollec@users.noreply.github.com>
 2018-01-13 13:27:38 -05: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
DL6ER
4dbf25ad08 Merge pull request #664 from pi-hole/fix/queries_over_longtime 
Long-term queries over time: Total queries should be all of them
 2018-01-07 20:56:14 +01:00
DL6ER
60814298ef Total queries should be (all of them) not only (forwarded + cached) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 20:46:15 +01:00
Mark Drobnak
5e25757415 Merge pull request #662 from pi-hole/tweak/database-timeout-warning 
Add timeout warning to database pages
 2018-01-07 14:35:26 -05:00
DL6ER
3506101ff5 Merge pull request #663 from pi-hole/fix/db_executiontime 
Set maximum execution time to 10 minutes in api_db.php
 2018-01-07 20:29:13 +01:00
DL6ER
0fdebd070c Set maximum execution time to 10 minutes in api_db.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 20:22:38 +01: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