DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
Conflicts:
advanced/Scripts/webpage.sh
7 years ago
Mcat12
6376f9aef4
Merge pull request #1680 from pi-hole/colour-consistency
...
Colour output consistency
7 years ago
spacedingo
f5a1fa21f7
Add ignore-case switch to sort (domains)
...
Domains with caps pass off as unique. It is necessary for proper duplicate removal.
Example:
::: /etc/pihole/list.preEventHorizon (2 results)
adsatt.abcnews.starwave.com
Adsatt.ABCNews.starwave.com
7 years ago
DL6ER
4a90dac68e
Simplify awk code as the format of ipp.txt is actually fixed (only one entry per line is allowed)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
2624e56de5
Parse /etc/openvpn/ipp.txt (if existing) and add entries to local.list.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
Adam Warner
aef54d6694
Merge branch 'development' into new/UninstallCleanup
7 years ago
Adam Warner
e839a7784c
Merge branch 'development' into sqlite-dependency
7 years ago
WaLLy3K
bea99abd8d
Ensure colour consistency between terminal themes
...
* Comment file for review-ability
* Add BOLD and UNDERLINE options
* Select most readable colours out of LIGHT/DARK options
* Provide empty variables for `set -u`
* Deprecate unnecessary variables
* Correct colours for TICK/CROSS/DONE
* Escape r twice and add ESC to OVER
7 years ago
WaLLy3K
a5c4ae955a
Merge branch 'development' into tweak/gravity
7 years ago
Dan Schaper
d7d53849a3
Merge pull request #1628 from pi-hole/fix/issue-template
...
Update Issue/PR Template text
7 years ago
WaLLy3K
b354f722be
Add link for EUPL
...
* Also formatted `git rebase` text to be consistent with `git commit --signoff`
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
ea1aad9774
Add review suggestions to template
7 years ago
WaLLy3K
817d644795
Merge branch 'development' into fix/issue-template
7 years ago
WaLLy3K
56b8c4bfdb
Merge branch 'development' into tweak/gravity
7 years ago
Adam Warner
c65c26b463
Merge branch 'development' into new/UninstallCleanup
7 years ago
WaLLy3K
bf059e5ee8
Merge pull request #1676 from pi-hole/remove-netstat
...
Replace superseded netstat command
7 years ago
WaLLy3K
15a5f425bf
Replace nc with psuedo-device
...
* Also fix minor conditional style issue
7 years ago
WaLLy3K
3125d24ded
Replace superseded netstat command
...
* Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR
* Rename piholeStatus function to statusFunc for function name consistency
* Replace superseded netstat command with nc
* Perform addn-hosts check using a single grep subshell
7 years ago
Adam Warner
6b6d105c2f
Merge branch 'development' into sqlite-dependency
7 years ago
WaLLy3K
bab44c52ae
Merge branch 'development' into blockpage2
7 years ago
WaLLy3K
2f19605750
Merge branch 'development' into fix/issue-template
7 years ago
WaLLy3K
7311db3a63
Change wording to support feature PR's
...
* Also clarify template suggestion text
* Remove stray '
7 years ago
WaLLy3K
0a00936e99
Update resolver test & added more comments
...
* Add/update code comments
* Change resolver check to test for pi.hole
* Make resolver check timeout after 10 seconds
* Use > instead of &> where appropriate
* Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable)
* Provide confirmation upon success of resolver check availability
* Quotes and Braced remaining variables as appropriate
* Removed duplicate local
7 years ago
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
7 years ago
WaLLy3K
feb412b02a
Merge pull request #1671 from pi-hole/release/3.2
...
Update development from release/3.2
7 years ago
Adam Warner
199de9ebc0
Merge branch 'development' into new/https
7 years ago
Adam Warner
504ae0193f
Merge branch 'development' into blockpage2
7 years ago
WaLLy3K
1ae403b742
Merge pull request #1667 from pi-hole/install-space
...
Remove erroneous space
7 years ago
Adam Warner
939c99cdbf
accidentally an entire group of letters.
7 years ago
WaLLy3K
2f36acae49
Remove errornous space
7 years ago
Adam Warner
e938132c53
accidentally a space
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
1b34286264
verbiage
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array
...
add `-f` to rm commands so that `set -e` is not kicked
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
07e5e8e67a
need to include `PH_TEST="true"` so that the install script isn't run when sourcing it.. doh
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
3c25094495
No need to declare `PKG_MANAGER`, as it's already declared in basic-install
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
95e3a5944d
Initial overhaul of uninstall script sourcing `distro_check()` from `basic-install.sh` Totally untested as yet...
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
64f29120c8
indent nested function in basic-install.sh
...
fix dependency in uninstall.sh
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
d92434b1e9
Merge branch 'development' into sqlite-dependency
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# automated install/basic-install.sh
7 years ago
Adam Warner
01cd056bcc
Work out correct SQLITE version for php-sqlite
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
56f2ea3ec2
Add Fedora/Centos dependency
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
d45695a088
Merge pull request #1643 from pi-hole/tweak/PiholeCheckout
...
Small tweaks to output of `pihole checkout`
7 years ago
Adam Warner
2ceeac41fe
Merge pull request #1648 from pi-hole/branding/DOReadme.md
...
Branding/DO readme.md
7 years ago
WaLLy3K
cc4ada99d8
Use SIGHUP instead of force-reload
7 years ago
Adam Warner
16d67f55b3
Merge branch 'development' into fix/issue-template
7 years ago
Adam Warner
18b41adbf6
Merge branch 'development' into tweak/gravity
7 years ago
Mcat12
898fdf7a60
Merge pull request #1602 from molikuner/development
...
Fix URL extension parsing
7 years ago
Adam Warner
78143c2ff4
Merge branch 'development' into blockpage2
7 years ago
Adam Warner
7b1524ad01
Merge branch 'development' into new/https
7 years ago
Adam Warner
5799485b0f
Merge branch 'development' into development
7 years ago
Mcat12
9cddb6ca39
Merge branch 'release/3.2' into branding/DOReadme.md
7 years ago