WaLLy3K
7453bf2ee6
Fix wildcard help text
...
* -wild is not a valid option since we're already using -wild
2017-05-16 10:23:53 +10:00
WaLLy3K
7d17c652f3
Merge branch 'development' into development
2017-05-16 10:18:32 +10:00
Adam Warner
90119c75d5
more merge conflicts!
2017-05-14 16:43:20 +01:00
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
2017-05-14 11:11:44 +10:00
Dan Schaper
25601b9fcc
Document sed substitution for user readability
...
Comment the oneliner with explanations of what each step does.
2017-05-13 17:49:58 -07:00
Adam Hill
55f78e3b64
Update list.sh
...
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
2017-05-13 18:44:41 -05:00
Mcat12
8fa209f0df
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
...
Only remove from wildcard list if domain is being added to whitelist …
2017-03-13 17:52:28 -04:00
Adam Warner
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
2017-03-13 20:38:34 +00:00
Markus Napp
bb7a7d94ef
Replace misleading letter variable
2017-03-12 16:16:45 +01:00
Markus Napp
9a475cc010
Rewrite help text for better handling of params
2017-03-12 15:50:48 +01:00
Markus Napp
ae30c285a2
Fix handling of wildcard help text
2017-03-12 15:45:11 +01:00
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
2017-03-10 14:29:38 +01:00
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 16:25:35 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
Markus Napp
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
Markus Napp
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
Markus Napp
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
DL6ER
3d4516dc95
Improve regex
2017-01-29 20:27:20 +01:00
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191
2017-01-29 13:54:39 +01:00
DL6ER
08cddba200
There should be no echo here
2017-01-28 21:49:31 +01:00
DL6ER
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
2017-01-28 21:48:19 +01:00
DL6ER
85b3fef08d
Use perl instead of grep?
2017-01-28 00:39:10 +01:00
DL6ER
15037fa888
Typo
2017-01-28 00:17:32 +01:00
DL6ER
d595fef18f
Fix regex
2017-01-28 00:15:06 +01:00
DL6ER
1bcf2dd0fc
Tweak CLI domain filter
2017-01-27 00:45:57 +01:00
DL6ER
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
DL6ER
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
DL6ER
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
Mcat12
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
2016-12-04 14:33:10 -05:00
DL6ER
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
2016-12-03 00:32:37 +01:00
DL6ER
509cfd15f2
Simplified EscapeRegexp()
2016-12-02 14:17:34 +01:00
DL6ER
2061daa902
Don't forget to escape also the slash "/"
2016-12-02 14:11:17 +01:00
DL6ER
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
2016-12-02 14:08:54 +01:00
DL6ER
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
2016-12-02 12:57:04 +01:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
DL6ER
7b26b308ad
No need for echo and pipe here!
2016-11-21 15:50:05 +01:00
DL6ER
4c10634d85
Convert domain names to lower case before checking validity of the domain
2016-11-21 15:49:11 +01:00
Eric Warnke
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
2016-10-28 17:28:04 -04:00
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.
2016-10-26 09:36:02 +01:00
