WaLLy3K
56990618e9
Prevent Block Page issue
...
* Block Page expects to see a full stop, otherwise it will throw an unhandled error
7 years ago
WaLLy3K
54a85d3a63
Fix invalid option case
...
* Ensure `pihole -q doubleclick.com asd` exits with error
7 years ago
WaLLy3K
d56beedd7a
Add idn2 dependency
7 years ago
WaLLy3K
c2d3e99ddd
Slow query fix & queryFunc optimisation
...
* Validate modified code using Shellcheck & Strict Bash
* Added and/or elaborated more comments
* scanlist() should exit if /etc/pihole is not available
* Add `export LC_CTYPE=C` to prevent extreme grep slowdown
* Consider "domain.com#comment" an exact match
* Add specialised wildcard searching grep
* Optimise and simplify queryFunc() for readability
* Replace IDN `python` parsing with `idn2`, as `python` is not guaranteed to be available
* Use ${COL_BOLD} when printing filenames
7 years ago
WaLLy3K
c458e4a93b
Merge pull request #1420 from WaLLy3K/new/https
...
Disable Let's Encrypt HTTPS & shift functions to block page
7 years ago
WaLLy3K
e7ae62ba76
Merge pull request #1416 from WaLLy3K/blockpage2
...
Block Page 2.0
7 years ago
Adam Warner
7a1df15724
Merge pull request #1688 from pi-hole/tweak/customBlockPage
...
Allow for Custom block page
7 years ago
Adam Warner
42b5574f9b
remove no longer needed tests
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
5f4be0de35
adjust lighttpd config depending on whether or not custom.php exists
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
6c605f55f9
always overwrite default blockpage, so that changes can be rolled out
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
DL6ER
17be6b860e
Merge pull request #1682 from pi-hole/tweak/VPN_hostnames
...
Add VPN host names to local.list
7 years ago
Adam Warner
474ac4a15d
Merge pull request #1581 from pi-hole/sqlite-dependency
...
Add "php5-sqlite" to dependencies
7 years ago
DL6ER
b8fedf76cd
Merge pull request #1572 from pi-hole/gedetil-development
...
Add web frontend shutdown command
7 years ago
DL6ER
ca88c59d4e
Merge pull request #1687 from spacedingo/patch-2
...
Add ignore-case switch to sort (domains)
7 years ago
Mcat12
d69e62589a
Merge branch 'development' into sqlite-dependency
7 years ago
DL6ER
c9d4995900
Update to comply with current development code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
279e809aaf
Use `poweroff` instead of `halt`
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
Mcat12
d61857efae
Merge branch 'development' into patch-2
7 years ago
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
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
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
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
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
WaLLy3K
2f36acae49
Remove errornous space
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
Adam Warner
16d67f55b3
Merge branch 'development' into fix/issue-template
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