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
736 Commits 16 Branches 105 Tags
fa8cec8fa7eace14cb2b31f8b7a077fb93a5dfcd
Commit Graph

736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Promofaux 9b8c92ed5d Fix query type display on pi-chart as raised in #54 2016-03-08 15:51:58 +00:00
Promofaux f5eef05ac3 Add an extra column to table to show pi-holed status. Highlight green or red depending on status. 2016-03-08 15:35:39 +00:00
Promofaux 91f2514ea1 Check gravity.list to see if domain is a pi-holed one 2016-03-08 15:34:26 +00:00
Mcat12 8d8b86189a Merge pull request #57 from pi-hole/apiChanges 
Fix divide-by-zero error as mentioned in #55
 2016-03-08 08:19:26 -05:00
Promofaux 8d02575b1a Fix divide-by-zero error as mentioned in #55 2016-03-08 13:01:27 +00:00
Mcat12 4f20cc6627 Fix query log refresh v1.1.5 2016-03-07 20:59:47 -05:00
Mcat12 61a42111e4 Fix query log refresh 2016-03-07 20:58:00 -05:00
Mcat12 725d0de52a Fix Query Log data v1.1.4 2016-03-02 16:12:25 -05:00
Mcat12 ddb2aa346d Fix Query Log data 2016-03-01 22:50:18 -05:00
Mcat12 2cbf026a74 Update README.md 2016-02-29 21:11:51 -05:00
Mcat12 b0e6662b5c Update README.md 2016-02-29 21:11:20 -05:00
Mcat12 38605cd8ea Update API docs 2016-02-29 21:10:39 -05:00
Mcat12 4faa50d66d Added new pictures 2016-02-29 21:03:32 -05:00
Mcat12 bc04b1c994 Made tooltip correct color on graph 2016-02-29 20:41:16 -05:00
Mcat12 af36ab0217 Merge pull request #50 from pi-hole/graphColors 
Change graph colors
 2016-02-29 20:36:54 -05:00
Mcat12 53f1f7c9c8 Made colors match 2016-02-29 20:34:44 -05:00
Mcat12 1378c94956 Merge pull request #49 from pi-hole/protectTheLists 
Protect the lists
 2016-02-29 20:07:19 -05:00
Mcat12 8e886e26bc Merge branch 'master' into devel 2016-02-28 15:48:24 -05:00
Mcat12 f3625ef5a7 Added github issue and pull request templates 2016-02-28 15:46:59 -05:00