Dan Schaper
169a4289a8
Merge pull request #2312 from pi-hole/release/v4.0
...
Update FTLDNS
6 years ago
Dan Schaper
1844bf17a7
Merge pull request #2311 from pi-hole/fix/git-head-flag
...
Fix wrong git command flag
6 years ago
Mark Drobnak
47b56d6123
Fix wrong git command flag
...
I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
6f2f598281
Merge pull request #2304 from pi-hole/development
...
Update FTLDNS with development
6 years ago
Dan Schaper
a44096a26d
Merge pull request #2303 from pi-hole/development
...
Update release/v4.0 with latest development changes
6 years ago
Dan Schaper
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
...
Fixed locale issue, do not parse for string.
6 years ago
Dan Schaper
39e28cd80a
Merge pull request #2302 from pi-hole/revert/2282
...
Revert #2282
6 years ago
Adam Warner
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Dan Schaper
46a366635c
Fixed locale issue, do not parse for string.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
415608ff01
Merge pull request #2276 from pi-hole/development
...
Update FTLDNS
6 years ago
Dan Schaper
384b588a2d
Merge pull request #2291 from pi-hole/merge/FTLDNS-to-development
...
Fix merge conflict in #2276
6 years ago
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
...
# Conflicts:
# advanced/Scripts/piholeDebug.sh
6 years ago
Dan Schaper
e32c76b059
Merge pull request #2289 from pi-hole/feature/space_tab
...
Adjusting spacing for utility scripts.
6 years ago
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
328e7738d5
Space/Tab version.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
aca359c2e2
Space/Tab updatecheck.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
1cd40dc9e5
Space/Tab update.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
dc9407281f
Space/Tab setupLCD.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
8f727c1f35
Space/Tab query.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
a08ea28feb
Space/Tab piholeLogFlush.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
c5535dd9a0
Space/Tab piholeCheckout.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
3519cc5e44
Space/Tab list.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
d251bbbb05
Space/Tab chronometer.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
1fc3ec9029
Merge pull request #2287 from pi-hole/feature/clean_comments
...
Remove empty comment lines in basic-install.sh
6 years ago
Dan Schaper
1877128fc4
Removes empty comment lines in basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck
...
fix some shellcheck/stickler compaints in debug script
6 years ago
Mark Drobnak
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
...
Updated port 53 check #2
6 years ago
RamSet
5aea7eb860
corrected function indentation
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Mark Drobnak
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
...
Installer fixes for Fedora & CentOS
6 years ago
RamSet
bb33427c79
fixed parsing error
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
28a16cebda
Addressed lint errors.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
49c79405bc
changed flag and variable name
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
3098f32a07
Fixed intentation and corrected comments.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Dan Schaper
b1e9c05bee
Merge pull request #2284 from pi-hole/bugfix/source_webpage
...
Added missing `.` for sourced file.
6 years ago
Dan Schaper
69e06d89ff
Added missing for sourced file.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
RamSet
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
3af61c031d
Merge pull request #1 from pi-hole/development
...
Development
6 years ago
Dan Schaper
f42a57088f
Merge pull request #2280 from rrobgill/development
...
Add regex option to autocomplete
6 years ago
WaLLy3K
4834452875
Merge pull request #2278 from pi-hole/fix/missing-wildlist-help-and-double-dash
...
Add back --wild list.sh help and use -- for long params like --regex
6 years ago
Rob Gill
c5b9d99b48
Add regex option to autocomplete
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
bcambl
fa9ecbdb81
add php-json to Fedora web deps
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
2bf6b29b8f
trigger an install/upgrade of PHP after enabling the Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Dan Schaper
25812f88f6
Merge pull request #2262 from bcambl/additional_tests
...
additonal test coverage for installer
6 years ago
Dan Schaper
037989b8e4
Merge pull request #2271 from pi-hole/feature/installer_spacing
...
Start changes to new code style for repository. Revise basic installer.sh spacing.
6 years ago
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
...
Use regex lists instead of wildcards for blocking
6 years ago
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
72be7ad5f0
Don't count commented out regex lines
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago