Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-27 13:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,386 Commits 24 Branches 113 Tags
ebe310d1dbdfd85bee5de503682dfb4e07f81597
Commit Graph

1386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mcat12
4b7f20cfae Take into account the whitelist and blacklist 2016-12-20 13:11:15 -05:00
Mcat12
472833cdbd Merge pull request #268 from pi-hole/LordKelvin 
Lord Kelvin
 2016-12-20 12:27:49 -05:00
DL6ER
fa4c81cef8 help.js has been removed 2016-12-20 18:22:18 +01:00
DL6ER
a54dfdefc9 trim string 2016-12-20 17:54:10 +01:00
DL6ER
b3907ea570 Test if line should be evaluated 2016-12-20 17:53:06 +01:00
DL6ER
0196bf5c5c Show percentage of blocked queries in graph tooltip 2016-12-20 13:22:02 +01:00
DL6ER
34a0a57447 Merge branch 'devel' into folderStructure 2016-12-20 12:52:37 +01:00
DL6ER
bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
DL6ER
ff7d1ed8fb Small bugfix 2016-12-20 12:21:30 +01:00
DL6ER
f5eaf6d140 Add Kelvin 2016-12-20 12:17:59 +01:00
Mcat12
30d70baf5e Fix php links in js files 
Also removed help.js because it's no longer used
 2016-12-19 19:59:08 -05:00
Mcat12
d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00
Mcat12
64ac22944e Merge pull request #265 from pi-hole/immediatetempunitchange 
Immediately apply changed temperature unit
 2016-12-19 19:30:46 -05:00
DL6ER
7ab611eb44 Added comment about absolute zero 2016-12-19 22:57:23 +01:00
Dan Schaper
02bc5b02a7 Merge pull request #266 from pi-hole/allowemptysecondDNSserver 
Allow empty second DNS server
 2016-12-19 11:08:12 -08:00
Promofaux
6a13796d99 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-19 18:30:16 +00:00
DL6ER
fc43a05e88 Try to get temperature value from different places (OS dependent) 2016-12-19 14:09:58 +01:00
DL6ER
4ddadd7043 Skip validation of secondary IP if set to "none" 2016-12-19 13:46:38 +01:00
DL6ER
da1c38ea5a Pass "none" to backend if we want no secondary DNS server 2016-12-19 13:44:12 +01:00
DL6ER
8ac9ce2746 Something different as well 2016-12-19 13:25:20 +01:00
DL6ER
d18269e835 Hide CPU temp if it is not available 2016-12-19 13:15:59 +01:00
DL6ER
e6bd9fd898 Increase resolution of displayed temperature 2016-12-19 13:09:44 +01:00
DL6ER
79af882627 Show "N/A" if we cannot get the temperature on the current machine (like in a virtual box) 2016-12-19 13:06:49 +01:00
DL6ER
77c1e8ff94 Immediately apply changed temperature unit 2016-12-19 12:44:24 +01:00