tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,318 Commits 11 Branches 110 Tags 32 MiB
Commit Graph

3318 Commits

Author SHA1 Message Date
DL6ER a7c73036f0
pihole -t: Warn user if Pi-hole's logging is disabled 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 13:37:41 +02:00
Mark Drobnak e80d27f273
Merge pull request #2234 from rrobgill/split-query-functions 
Fix grep query leak & relocate query
 2018-06-15 19:25:32 -04:00
Rob Gill 23adbf9540
remove quotes 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:45:27 +10:00
Rob Gill a7347238e6
$adListsList replace filename in text 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:42:30 +10:00
Rob Gill bf55666492
Appease stickler. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:29:07 +10:00
Rob Gill 8ab0b0e460
colfile 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:25:43 +10:00
Rob Gill b8e1849cec
wildcardlist 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:19:07 +10:00
Rob Gill 2255d05664
Remove scanlist(), now in query.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:09:49 +10:00
Rob Gill 45a8eda49b
Stop grep leak in query 
Fix grep error leak from #1805

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:08:21 +10:00
Rob Gill b1207949ac
Call query.sh to replace queryFunc() 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 15:49:52 +10:00
Rob Gill d61fd01d61
Split queryFunc() into query.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 15:47:08 +10:00
Mark Drobnak 4d5d3108fb
Merge pull request #2231 from alexvy86/patch-1 
Remove error text from message when next whitelist request succeeds
 2018-06-11 19:41:48 -04:00
Alex Villarreal e422f4154f Clean error message on successful response 
Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
 2018-06-11 12:59:53 -05:00
Mark Drobnak 0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck 
Bugfix - Check version of installed php
 2018-06-08 23:31:40 -04:00
Rob Gill 11f0ade921
comments 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-09 13:18:36 +10:00
Mark Drobnak 5cab2e1c43
Merge pull request #2224 from rrobgill/bashcompletion 
Bashcompletion
 2018-06-08 21:45:03 -04:00
Rob Gill 6381bdbf33
don't use major.minor for PHP 5 
Signed-off-by: <rrobgill@protonmail.com>
 2018-06-09 11:35:30 +10:00
Mark Drobnak c8bcd4af2d
Merge pull request #2004 from pi-hole/tweak/32bitOS_on_64bitCPU 
Install 32bit FTL on 32bit OS (even if 64bit architecture is detected)
 2018-06-08 20:56:36 -04:00
Rob Gill cabb06230c
--json not --jason 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-09 10:30:04 +10:00
Mcat12 4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU 2018-06-08 20:20:57 -04:00
Mark Drobnak d9c924b472
Merge pull request #2225 from rrobgill/ftlinstall-local-vars 
remove duplicate declaration in ftlinstall()
 2018-06-06 19:51:06 -04:00
Rob Gill 52aa52c3b1
remove duplicate declaration 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-07 08:19:26 +10:00
Rob Gill 8004080643
Additional command-line completion 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-06 22:37:43 +10:00
Rob Gill 13878974a6
Merge pull request #4 from pi-hole/development 
Development
 2018-06-06 14:21:50 +10:00
Mark Drobnak 6689e00e6a
Merge pull request #2212 from rrobgill/man-pages 
Man page for pilhole-FTL
 2018-06-05 21:33:54 -04:00
Mark Drobnak 9b8a108f86
Merge pull request #2221 from pi-hole/tweak/statsnologs 
Stats can still be generated without logging, no need for this sentence
 2018-06-05 18:39:44 -04:00
Rob Gill a3569d88c9
Version strings & bash. 
Fixed up the version checking. Thanks for your help @dschaper.

No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5. 

Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 21:42:42 +10:00
Adam Warner f2f6b6ede9
stickler complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-05 09:29:03 +01:00
Adam Warner 7f81cfd45a
Stats can still be generated without logging, no need for this sentence 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-05 09:09:35 +01:00
Rob Gill 13b8e1a2ae
quotes. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 15:09:07 +10:00
Rob Gill 36dbdf955d
Update basic-install.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:48:24 +10:00
Rob Gill 714b6c98ef
codacy 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:45:01 +10:00
Rob Gill 7181d7ae6a
Left that fi 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:30:18 +10:00
Rob Gill 9422d57283
Check version of installed php 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 12:08:27 +10:00
Jacob Salmela 5724cec1e5
Merge pull request #2219 from pi-hole/tweak/readme 
Add coverage, remove projects, add Patreon link
 2018-06-04 20:12:18 -05:00
Jacob Salmela 35ca54d98f
add patreon and adjust affiliate links 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-06-04 20:00:26 -05:00
Jacob Salmela 7398a9ebf9
remove projects that are not compliant with our trademarks 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-06-04 19:59:23 -05:00
Rob Gill 4188fb536e
Privacy levels 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 10:25:51 +10:00
Rob Gill a11e5e2deb
dnsmasq 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 10:23:23 +10:00
Mark Drobnak 5dd7e8c4d9
Merge pull request #2215 from rrobgill/web-console 
Changes to --help text
 2018-06-04 18:20:57 -04:00
Rob Gill 40bc390c3b
Admin Console -> "Web Interface" 
User facing --help text changes
Admin Console --> Web Interface
and additional branch option

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-06-04 13:34:42 +10:00
Rob Gill 8776348a80
Merge pull request #2 from pi-hole/development 
Development
 2018-06-04 10:05:58 +10:00
Rob Gill 49fb4421dd Requested changes to manpages - now align with docs.pi-hole.net/ftldns. weird bolding issues fixed 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-04 09:54:53 +10:00
Mark Drobnak d232f08933
Merge pull request #2208 from pi-hole/tweak/checkout 
Don't run the installer when doing ftl checkout, instead just run the…
 2018-06-03 14:35:35 -04:00
Dan Schaper feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7 
CentOS install re-worked to provide PHP7 via Remi Repository
 2018-06-03 10:54:32 -07:00
Dan Schaper 928d7186b5
Merge pull request #2214 from pi-hole/fix/gravity-comment 
Fix gravity_ParseFileIntoDomains Awk comment
 2018-06-03 10:52:46 -07:00
Mark Drobnak 3149a95d6a
Fix gravity_ParseFileIntoDomains Awk comment 
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
 2018-06-03 13:33:33 -04:00
Rob Gill ed7ebfd58d man page for pihole-FTL 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-03 22:15:26 +10:00
Rob Gill 808e310799
Merge pull request #1 from pi-hole/development 
Development
 2018-06-03 20:54:03 +10:00
Mark Drobnak 23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page 
Manual page
 2018-06-02 21:11:21 -04:00