WaLLy3K
|
b087888f94
|
Merge pull request #2261 from pi-hole/fix-no-protocol
Treat adlists URLs without a protocol as HTTP
|
2018-07-03 09:58:29 +10:00 |
|
bcambl
|
da3dfd0998
|
python linting: missing whitespace after ':' (E231)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
|
2018-07-02 15:25:51 -06:00 |
|
bcambl
|
4468d81472
|
python linting: 2 lines prior to defs (E302)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
|
2018-07-02 14:54:19 -06:00 |
|
WaLLy3K
|
7ddae8f2eb
|
Treat URLs without a protocol as HTTP
Signed off by WaLLy3K <wally3k@pi-hole.net>
|
2018-07-02 19:59:22 +10:00 |
|
Mark Drobnak
|
6b2851a671
|
Merge pull request #2257 from pi-hole/fix/query-process-wildcards
Move processWildcards to query.sh
|
2018-06-30 22:18:46 -04:00 |
|
Mcat12
|
4763969c8f
|
Move processWildcards to query.sh
Closes #2255
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-30 22:03:53 -04:00 |
|
Mark Drobnak
|
f9b75e486c
|
Merge pull request #2256 from pi-hole/fix/query-lists-variable-substitution
Fix incorrect variable string substitution
|
2018-06-30 15:56:22 -04:00 |
|
Mcat12
|
f868052062
|
Fix incorrect variable string substitution
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-30 15:50:43 -04:00 |
|
Mcat12
|
61f0cbe10a
|
Update pihole man page for regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-29 23:34:15 -04:00 |
|
Mcat12
|
0f4968d75c
|
Merge remote-tracking branch 'origin/development' into new/regex-lists
|
2018-06-29 23:12:34 -04:00 |
|
Mcat12
|
3077c22e4f
|
Change help strings from wildcard to regex blacklist
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-29 23:10:49 -04:00 |
|
Mcat12
|
0decc37b5a
|
Appease stickler
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-29 22:55:00 -04:00 |
|
Mcat12
|
4a953b66e0
|
Make removing regex domains work correctly
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-29 22:51:37 -04:00 |
|
Mcat12
|
8435eeed4d
|
Don't validate regex domains
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-28 23:31:50 -04:00 |
|
Mcat12
|
cffb4de83b
|
Use strict grep instead of regex for duplicates
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-28 23:01:27 -04:00 |
|
Mcat12
|
55175087c4
|
Set regex file permissions for web access
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-28 22:52:44 -04:00 |
|
Dan Schaper
|
0ddfa8ad10
|
Merge pull request #2254 from andrewjanke/patch-1
typo fix
|
2018-06-28 07:34:35 -07:00 |
|
Andrew Janke
|
b74fb3f179
|
typo fix
|
2018-06-29 00:28:43 +10:00 |
|
bcambl
|
9d3d33b6a2
|
add tests for selinux checking
Signed-off-by: bcambl <blayne@blaynecampbell.com>
|
2018-06-26 00:09:30 -06:00 |
|
Dan Schaper
|
2abaa60c2e
|
Merge pull request #2249 from pi-hole/revert-2069-fix/nullbyte
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
|
2018-06-25 08:35:09 -07:00 |
|
Dan Schaper
|
d5547f5c7c
|
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
|
2018-06-24 16:06:55 -07:00 |
|
Mark Drobnak
|
061510098c
|
Merge pull request #2246 from pi-hole/fix/debug-simple-gravity-list
Update debug script for simple list format
|
2018-06-22 22:41:36 -04:00 |
|
Mark Drobnak
|
4fc3546887
|
Merge pull request #2069 from pi-hole/fix/nullbyte
Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input
|
2018-06-20 20:42:24 -04:00 |
|
Mcat12
|
868948509a
|
Split declaration and assignment of random_url
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-20 20:30:42 -04:00 |
|
Mark Drobnak
|
e71492a2b3
|
Update debug script for simple list format
Gravity is now just a list of domains, not IP addresses and domains separated by a space.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-06-20 20:29:32 -04:00 |
|
Mark Drobnak
|
c2055f3514
|
Merge pull request #2240 from pi-hole/tweak/warn_on_tail_if_log_disabled
pihole -t: Warn user if Pi-hole's logging is disabled
|
2018-06-17 11:23:27 -04:00 |
|
DL6ER
|
2809579dd7
|
Refine regex filter generation
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-06-17 14:59:21 +02:00 |
|
DL6ER
|
c7afe3e9a4
|
Please stickler by making clear that the variable regexFile is declared outside of this routine
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-06-17 14:46:26 +02:00 |
|
DL6ER
|
cd026cd865
|
Add comment where regexList is defined
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-06-17 14:43:33 +02:00 |
|
DL6ER
|
bc705aac03
|
Add automated wildcard list -> regex filter conversion
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-06-17 14:39:19 +02:00 |
|
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 |
|