pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
755 Commits 16 Branches 105 Tags
1795170b70c8317d753c8adbccf85cd42883f03f
Commit Graph

755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mcat12 1795170b70 Merge pull request #87 from pi-hole/boostrap-map 
Appease the Chrome Dev Tool errors
 2016-05-02 20:45:26 -04:00
Mcat12 9fdcdabab2 Appease the Chrome Dev Tool errors 
Chrome kept telling me to find this file, so I did
 2016-05-02 20:42:47 -04:00
Adam Warner 8230f1e81a Merge pull request #85 from pi-hole/BugFix484 
Split $host at any whitespace, not just tab.
 2016-04-28 21:01:05 +01:00
Promofaux e79dc2bb0e Split $host at any whitespace, not just tab. 
addresses : https://github.com/pi-hole/pi-hole/issues/484
 2016-04-28 20:22:27 +01:00
Adam Warner cb57c0cf9c Merge pull request #84 from roddux/xss-patch-devel 
Fix for XSS bug
 2016-04-22 14:38:37 +01:00
Rory M 26d54cfa9b Fix for XSS bug 
I actually tested this one! it works.
My apologies for the previous, non-working commits-- I had to refresh my knowledge of PHP.
 2016-04-22 14:27:21 +01:00
Rory M b91b7cacb0 Final fix for XSS patch 
`htmlspecialchars` does not work on arrays.
This is why testing is important :^)
 2016-04-22 13:21:53 +01:00
Rory M 66e0c0f66e Fixed incorrect ordering of sanitisers 
`json_encode` needs to call the result of `htmlspecialchars`, not visa versa!
 2016-04-22 13:12:10 +01:00
Rory M 87ddd4cbc7 Fix for XSS bug 
Pointed at the correct branch this time.
 2016-04-22 12:34:41 +01:00
Promofaux 861be94589 actually limit list of sources to 10. 2016-04-18 22:46:49 +01:00
Adam Warner e1e5e50c69 Merge pull request #78 from pi-hole/HostNames 
Adds hostnamesm, removes the ugly radar chart for top clients, and moves to a list.
 2016-04-16 14:52:13 +01:00
Promofaux 51b13087ca Switch display order of Hostname IP to be Hostname (IP) 2016-04-16 14:46:44 +01:00
Promofaux ab93f9e4b6 Remove Radar chart for top clients. Add table similar to top ads and top domains 2016-04-16 14:23:59 +01:00
Promofaux f45d42ca63 Changes to data.php to allow showing Top 10 clients in table 2016-04-16 14:21:34 +01:00
Promofaux 8d03e0c2b5 Merge branch 'devel' of github.com:pi-hole/AdminLTE into HostNames 2016-04-16 14:14:07 +01:00
Promofaux fa8cec8fa7 add extra check to getAllQueries so that reads of gravity.list are not counted as pi-holed 2016-04-16 02:50:15 +01:00
Promofaux d3780def4e Change TopClients to Doughnut chart instead of Radar chart, due to bug I cannot for the life of me work out (missing one client's value) 2016-04-16 01:56:03 +01:00
Promofaux 4499e2f3b9 Remove erroneous space after hostname 2016-04-16 01:07:33 +01:00
Promofaux c9e840efa9 Add hostname check to Top Clients graph and Query Log page 2016-04-16 00:56:30 +01:00
Promofaux 02f6517b55 Add ability to check for local hostnames 2016-04-16 00:55:19 +01:00
Promofaux ad2715e23f Increase complexity of FindAds filter. Removes 'bad name' and host file reload lines from the log whilst parsing 2016-04-15 23:40:40 +01:00
Adam Warner 8eabbbd90e Merge pull request #74 from pi-hole/BugFix73 
Closes #73
 2016-04-15 21:49:54 +01:00
Adam Warner 34d995bf0f Merge pull request #75 from pi-hole/TurnOffAnimations 
Simple turn off animations for now. Toggling to come later.
 2016-04-15 21:49:18 +01:00
Promofaux 77de621d25 possible fix lighttpd for error where $status was undefined 2016-04-15 21:27:32 +01:00
Promofaux 8bb172aae6 Simple turn off animations for now. Toggling to come later. 2016-04-15 21:17:18 +01:00
Promofaux 52281939eb Create seperate filter for get all queries, as it was messing up the main page. 2016-04-15 21:04:08 +01:00
Promofaux 1028d164dc revamp the getAllQueries function. The filter now includes the 'forwarded' and '/etc/pihole/gravity.list' lines. Super Zoomy! 2016-04-15 20:40:32 +01:00
Promofaux 6ebe481351 Rename function to make more sense. 2016-04-15 19:12:50 +01:00
Adam Warner 6d175c2f55 Merge pull request #71 from 7h3ju57/pistatus 
Get an actual status. (Makes the status indicator on the main page actually mean something...)
 2016-04-15 19:10:16 +01:00
Adam Warner 4cbebe68f7 Merge pull request #69 from 7h3ju57/devel 
Fix for high CPU usage caused by "PHP Warning" flooding the journal.
 2016-04-15 19:07:01 +01:00
Justin Theberge f0c8d759f6 removed unused icons 2016-04-08 19:52:10 -04:00
Justin Theberge 4ae7f83ed4 replace icon with font awesome circle 
change to "Nominal" to "Active"
fixed some indentation
 2016-04-08 19:37:56 -04:00
Justin Theberge d1db4a86d7 fix an oops 2016-04-07 22:47:03 -04:00
7h3ju57 e7829ab127 actually get pihole status from dnsmasq 2016-04-07 22:44:47 -04:00
Justin Theberge b540ace987 relevant names 2016-04-06 10:19:07 -04:00
Justin Theberge 63539fa16a fix linecount 2016-04-06 09:48:50 -04:00
Justin Theberge 096bc06d65 Fix for high CPU usage caused by "PHP Warning" flooding the journal. 
PHP Warning:  fgets() expects parameter 1 to be resource, boolean was given
 2016-04-05 08:59:03 -04:00
Adam Warner 4297718527 Merge pull request #64 from pi-hole/apiChanges 
More API improvements
 2016-03-31 23:45:28 +01:00
Promofaux ba10330960 PHP no longer falls over when reading in a large number of domains from the blocklist 2016-03-31 23:26:19 +01:00
Mcat12 480c936fbc Merge pull request #63 from pi-hole/fix-template-team-link 
fix template team link
 2016-03-28 23:03:28 -04:00
Mcat12 e472743379 fix template team link 2016-03-28 22:49:23 -04:00
Mcat12 991d273573 Merge master into devel 
Conflicts: data.php
 2016-03-23 20:19:26 -07:00
Mcat12 d4dc0f52ae Merge pull request #62 from pi-hole/fixQueryLog 
Actually fixed query log this time
 2016-03-21 20:54:27 -07:00
Mcat12 5394118fb6 Fixed status indicator 
Was still using old indexing
 2016-03-17 20:37:18 -04:00
Mcat12 edeaaabbe3 Merge branch 'devel' into fixQueryLog 
Conflicts:
	data.php
 2016-03-16 20:55:45 -04:00
Mcat12 b37ed3fa51 Actually fixed query log this time 
Maybe
 2016-03-16 20:35:37 -04:00
Adam Warner 6df1260a98 Merge pull request #59 from pi-hole/apiChanges 
Vastly improve checking for domain in gravity.list
 2016-03-08 19:17:57 +00:00
Promofaux e61c189bcc Vastly improve checking for domain in gravity.list (think 30+ seconds down to 1) 2016-03-08 19:09:38 +00:00
Mcat12 951a28cb36 Disable list editing 2016-03-08 12:30:35 -05:00
Mcat12 5e4af2a957 Merge pull request #58 from pi-hole/apiChanges 
Api changes
 2016-03-08 11:53:29 -05:00