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
1,425 Commits 16 Branches 105 Tags
f3cc33a140ced7e3ee6831ddbb2a5019eab7b520
Commit Graph
1425 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER f3cc33a140 Fixed one comment 2016-12-23 14:03:09 +01:00
DL6ER 503e9a5235 Strings must use doublequote. 2016-12-23 13:56:24 +01:00
DL6ER 05fba3e542 Adjusted wording slightly 2016-12-23 13:55:29 +01:00
DL6ER a47eb094dd Add auto scrolling feature 2016-12-23 13:53:18 +01:00
DL6ER 1009dba240 100% non-blocking using our awesome API 2016-12-23 13:39:29 +01:00
DL6ER 0656526d43 Add blocking version of pihole.log tailing 2016-12-23 12:49:54 +01:00
DL6ER 2b2c3bbf27 Merge pull request #264 from pi-hole/overhaulGetBlockesQueries 
New logic for API functions getBlockedQueries() and countBlockedQueries()
 2016-12-23 11:52:30 +01:00
Adam Warner f92d138202 Merge pull request #253 from pi-hole/clienthosts 
Improve API calls for Top Clients and Forward Destinations
 2016-12-23 10:37:37 +00:00
DL6ER 8e3e9e3a9d Merge pull request #283 from pi-hole/fix/smallscreens 
Fix display of summary on small screens
 2016-12-22 22:38:25 +01:00
DL6ER 8e607916fe Fix small screen behavior 2016-12-22 22:26:14 +01:00
DL6ER 41cd38256d Merge branch 'devel' into clienthosts 
Conflicts:
	data.php
 2016-12-22 19:36:23 +01:00
DL6ER a1d8874ea3 Merge branch 'devel' into overhaulGetBlockesQueries 2016-12-22 16:45:09 +01:00
DL6ER 17c4a43f51 Merge pull request #278 from pi-hole/Mcat12-fix-noIPv4-DHCP 
Handle no IPv4 address when guessing initial DHCP
 2016-12-22 00:28:57 +01:00
DL6ER 765db730b6 Empty suggestion instead of 0.0.0.0 2016-12-21 23:59:01 +01:00
Mcat12 688f7dd5c7 Fix typo 2016-12-21 17:53:46 -05:00
Mcat12 a0554e9859 Handle no IPv4 address when guessing initial DHCP 2016-12-21 16:39:36 -05:00
Adam Warner 4fb5417d82 Merge pull request #275 from pi-hole/nonstandardport 
Add support for web server port != 80
 2016-12-21 21:08:06 +00:00
DL6ER 623ef322e4 Add support for port != 80 2016-12-21 20:45:02 +01:00
Adam Warner fa1642da99 Merge pull request #271 from pi-hole/checkfilesbeforereading 
Check if files exist before trying to read them
 2016-12-21 17:54:35 +00:00
Mcat12 ebe310d1db Correctly parse IPV4_ADDRESS in setupVars for CORS 
Often there's a `/24` at the end of the IP, so we need to ignore
that.
 2016-12-21 12:32:36 -05:00
Mcat12 c530e58eb9 Remove unnecssary import 
When api.php imports data, it already has imported func.php
 2016-12-21 12:31:08 -05:00
Mcat12 977c026868 Use checkfile on get.php 
Move checkfile to funcs.php to be used by more scripts
 2016-12-21 12:24:48 -05:00
Mcat12 8b59998299 Use IPv4 from setupVars for CORS 2016-12-21 12:08:19 -05:00
DL6ER 7f4f25053e empty arrays 2016-12-21 17:58:16 +01:00
DL6ER 6da7d9eaa4 Merge branch 'devel' into checkfilesbeforereading 2016-12-21 17:40:17 +01:00
Adam Warner f34923b669 Merge pull request #272 from pi-hole/revertfolderrefactor 
Revert folder refactor PR
 2016-12-21 16:23:39 +00:00
DL6ER e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure" 
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
 2016-12-21 17:16:52 +01:00
DL6ER b9f0e432a8 mend 2016-12-21 14:58:32 +01:00
DL6ER 1122cf307e Check if file is readable 2016-12-21 14:57:27 +01:00
DL6ER abe2203acc codacy fix (no functional change) 2016-12-21 14:52:59 +01:00
DL6ER 264c25203b Replaced hard-coded filenames in other places 2016-12-21 14:49:27 +01:00
DL6ER 5ebc8ac23a Simplify function gravityCount() 2016-12-21 14:35:49 +01:00
DL6ER aeaa6d2c4a Check if pihole.log and list.preEventHorizon exist, too 2016-12-21 14:33:28 +01:00
DL6ER 502782b6ef Some more explaination 2016-12-21 14:24:47 +01:00
DL6ER 7fcb875f65 Minor tweaks 2016-12-21 14:23:40 +01:00
DL6ER 82ae58fb0c Test if white-/blacklist exist before trying to create a PHP file object 2016-12-21 14:19:49 +01:00
DL6ER ad5f1115a1 Change from getDnsQueriesAll($log) to getDnsQueries($log). Don't have to check if the line includes "query" since we only collect "query" lines now 2016-12-21 13:38:00 +01:00
DL6ER dfa2f071a9 Only look for query[A, i.e. query[A] and query[AAAA] 2016-12-21 13:35:34 +01:00
DL6ER 40edcf667b Merge branch 'devel' into clienthosts 2016-12-21 13:16:46 +01:00
DL6ER ef9e5cb9bd Merge branch 'devel' into overhaulGetBlockesQueries 2016-12-20 23:24:05 +01:00
DL6ER 815c4a7173 make function getBlockedQueries(\SplFileObject $log) compatible with extra logging format of dnsmasq 2016-12-20 23:23:41 +01:00
Mcat12 fba3d10fa4 Merge pull request #267 from pi-hole/folderStructure 
Fix folder structure
 2016-12-20 17:16:36 -05:00
DL6ER 42c9439d1e Merge branch 'devel' into folderStructure 2016-12-20 23:09:39 +01:00
DL6ER 4ee75f4167 Merge pull request #269 from pi-hole/howmuchblockedingraph 
Show percentage of blocked queries in graph tooltip
 2016-12-20 23:00:02 +01:00
Mcat12 eee3e13ed1 Merge pull request #270 from pi-hole/fix/QueryLogWrongStatus 
Fix Query Log Wrong Status
 2016-12-20 16:43:22 -05:00
DL6ER b01d8293db Improved comments 2016-12-20 21:40:19 +01:00
DL6ER d89fb7a0e0 Have to modify the correct array for this to work... 2016-12-20 21:38:51 +01:00
DL6ER be5a6cb5df Use only one array, no additional loops 2016-12-20 21:31:49 +01:00
DL6ER b298f1ab06 Loop over $whiteList, simplified code slightly 2016-12-20 21:19:49 +01:00
Mcat12 f9a601c5b0 Avoid array_merge 
Simply unset and set when applying whitelist and blacklist
 2016-12-20 13:38:42 -05:00