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,403 Commits 19 Branches 112 Tags
63061fa8266da1505cc1fa10c429706be7bf7322
Commit Graph

2403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
7d491841b8 Merge pull request #661 from pi-hole/fix/long-term-lowercase 
Convert host names and domains to lower case in DB replies
 2018-01-07 19:31:39 +01:00
DL6ER
0fbd860827 Process all returned data before sorting and slicing the data 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 19:13:58 +01:00
DL6ER
84012074de Add the same logic for topDomains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:15:08 +01:00
DL6ER
9cc8062c88 Fetch up to 20 clients and limit the list to 10 results in PHP 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:07:39 +01:00
DL6ER
047329a4ae Reset the SQL syntax - directly doing it in PHP is obviously much faster! 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:02:13 +01:00
DL6ER
f0f32e82a5 Convert all client host names to lower case when requesting api_db.php?topClients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 17:49:55 +01:00
Mark Drobnak
1a7e10cfdf Merge pull request #660 from pi-hole/tweak/blocking-lists-warning 
Add Warning to Settings Page: Block Lists
 2018-01-05 18:28:37 -05:00
Mcat12
b0a56e9017 Add warning to block lists tab of settings page 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-05 18:15:02 -05:00
DL6ER
80176d6167 Merge pull request #659 from pi-hole/fix/TravisVersioning 
FTL version display
 2018-01-06 00:12:17 +01: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
9319a5234c Merge pull request #657 from pi-hole/fix/preg_split 
Fix preg_split warning
 2018-01-02 12:13:16 -05: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
e19a5928a8 Merge pull request #655 from pi-hole/fix/db_fail_gracefully 
Fail gracefully on database problems
 2017-12-31 10:29:39 +01:00
DL6ER
78a8aa8b31 Check if $results is boolean and use fetchArray() only if it isn't 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 23:44:01 +01:00
Mark Drobnak
3d6ed38886 Merge pull request #654 from pi-hole/new/add_second_quad9 
Add quad9 secondary IPv4 server
 2017-12-30 13:01:43 -05:00
DL6ER
bc1f6f9be6 Add quad9 secondary IPv4 server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 18:26:49 +01:00
DL6ER
9f16324cd0 Merge pull request #651 from pi-hole/master 
Sync with development branch
 2017-12-22 21:59:14 +01:00
Jacob Salmela
31dddd8a06 Merge pull request #645 from pi-hole/release/v3.2.1 
Pi-hole web v3.2.1
v3.2.1 		2017-12-22 14:48:16 -06:00
Mark Drobnak
4190605b1b Merge branch 'devel' into mobile-query-log2 2017-12-22 12:45:51 -05:00
Mark Drobnak
224bb79dbf Merge branch 'devel' into mobile-query-log2 2017-12-22 12:44:30 -05:00
DL6ER
556da99dbf Merge pull request #644 from pi-hole/tweak/DB_location 
Use non-standard location of FTL's database
 2017-12-19 19:26:34 +01:00
DL6ER
7847c64a53 Merge pull request #649 from pi-hole/fix/codacy-v3.2.1 
Codacy issues on release/v3.2.1
 2017-12-18 17:40:39 +01:00
DL6ER
cfa9bfbbd2 :codacy: 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-17 21:08:58 +01:00