WaLLy3K
7453bf2ee6
Fix wildcard help text
...
* -wild is not a valid option since we're already using -wild
7 years ago
WaLLy3K
7d17c652f3
Merge branch 'development' into development
7 years ago
Adam Warner
90119c75d5
more merge conflicts!
7 years ago
WaLLy3K
b721ed49ab
Update Help Output ( #1467 )
...
* File consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Standardise core help text
* Added help text for disable command
* Added help text for logging command
* Clean up
* Fixed certain new lines and spaces
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Admin help text
* Added help text for interface command
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces
* Formatting consistency
* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Blacklist help text
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Cronometer help text
* Formatting consistency
* Fixed certain newlines and spaces
* Corrected indenting
* Checkout warning alteration
* Add checkout help text
* Corrected help output
7 years ago
Dan Schaper
25601b9fcc
Document `sed` substitution for user readability
...
Comment the oneliner with explanations of what each step does.
7 years ago
Adam Hill
55f78e3b64
Update list.sh
...
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
7 years ago
Mcat12
8fa209f0df
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
...
Only remove from wildcard list if domain is being added to whitelist …
8 years ago
Adam Warner
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
8 years ago
Markus Napp
bb7a7d94ef
Replace misleading letter variable
8 years ago
Markus Napp
9a475cc010
Rewrite help text for better handling of params
8 years ago
Markus Napp
ae30c285a2
Fix handling of wildcard help text
8 years ago
DL6ER
6f8893d950
Merge pull request #1301 from pi-hole/fix/removewildcard
...
Remove wildcard entry when adding the very same domain either the white- or blacklist
8 years ago
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
8 years ago
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
8 years ago
Markus Napp
01f643e5eb
fixup! Fix spacing for wildcard help in list script
8 years ago
Markus Napp
8037f3e332
Fix spacing for wildcard help in list script
8 years ago
Markus Napp
afe5176e01
Justify help output to match main script
8 years ago
DL6ER
3d4516dc95
Improve regex
8 years ago
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191
8 years ago
DL6ER
08cddba200
There should be no echo here
8 years ago
DL6ER
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
8 years ago
DL6ER
85b3fef08d
Use perl instead of grep?
8 years ago
DL6ER
15037fa888
Typo
8 years ago
DL6ER
d595fef18f
Fix regex
8 years ago
DL6ER
1bcf2dd0fc
Tweak CLI domain filter
8 years ago
DL6ER
ebf0db4bbf
Typo fixed
8 years ago
DL6ER
9ac265980f
Add .conf to filename
8 years ago
DL6ER
40798da6b1
Add blacklisting wildcard support
8 years ago
Mcat12
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
8 years ago
DL6ER
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
.
8 years ago
DL6ER
509cfd15f2
Simplified EscapeRegexp()
8 years ago
DL6ER
2061daa902
Don't forget to escape also the slash "/"
8 years ago
DL6ER
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
8 years ago
DL6ER
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
8 years ago
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
7b26b308ad
No need for echo and pipe here!
8 years ago
DL6ER
4c10634d85
Convert domain names to lower case before checking validity of the domain
8 years ago
Eric Warnke
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
8 years ago
Adam Warner
469ff45f01
create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
...
update pihole script to reflect new white/blacklist command.
8 years ago