Dillon Flamand
37e8a91d5b
Remove dead link from CONTRIBUTING.md
...
Removed a link to a github repo that no longer exists.
Signed-off-by: D. Flamand <dflamand@users.noreply.github.com>
6 years ago
Mark Drobnak
d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
...
Remove PA YAML file
6 years ago
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
6 years ago
justinamcafee
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
6 years ago
justinamcafee
2895b9bfb7
Added support for FamilyShield from OpenDNS
...
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
6 years ago
Adam Warner
71d8f5f96f
remove PA YAML file
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
856a2096eb
Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch
...
Store checked out FTL branch in /etc/pihole/ftlbranch
6 years ago
Adam Warner
76cb129d3c
don't forget `master` and `development` branches!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
aed20cf7c6
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
...
Gravity falls over when there is no whitelist file
6 years ago
Adam Warner
ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
...
Bugfix mktmp > mktemp
6 years ago
Dan Schaper
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
6011dd7372
Merge pull request #2000 from pi-hole/fix/FTL_Install
...
Use pushd/popd and create random temporary directory
6 years ago
Dan Schaper
41d9d57c84
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
...
Specifty `LC_ALL=C` when dealing with sorted lists.
6 years ago
Dan Schaper
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Adam Warner
6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
d4ac818a0b
Specifty `LC_ALL=C` when dealing with sorted lists.
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
6 years ago
Ludovic Rousseau
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
6 years ago
DL6ER
40bda4b3d1
Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service
...
Always replace pihole-FTL.service
6 years ago
Ludovic Rousseau
b7891f92a5
Create blacklist.txt if not existant
...
Closes: https://github.com/pi-hole/pi-hole/issues/1888
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
DL6ER
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
6 years ago
DL6ER
b8eaa9a527
Use double quotes to precent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
5d274008db
Use possibly user-defined database location when flushing
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
220e755596
Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting
...
Don't auto-whitelist blocking list domains
6 years ago
DL6ER
fc5034696d
Don't auto-whitelist blocking list domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
4a6f77bc59
Merge pull request #1967 from pi-hole/master
...
Git flow Pi-hole v3.3
6 years ago
Dan Schaper
1e87850952
Merge pull request #1943 from pi-hole/release/3.3
...
Pi-hole v3.3
6 years ago
Mark Drobnak
3472241289
Merge pull request #1962 from floek/master
...
Fixes https://github.com/pi-hole/pi-hole/issues/1772
6 years ago
Florian Freund
a944b6ff79
Fixes https://github.com/pi-hole/pi-hole/issues/1772
6 years ago
Mark Drobnak
6c4741bc61
Merge pull request #1730 from pi-hole/tweak/block-page-no-password
...
Disable password field on block page if no password is set
6 years ago
Mcat12
8a42ef431b
Fix Javascript warning when no password is set
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
2cf1f0e8fc
Hide the password input when there is no password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
55e50eced6
Merge branch 'development' into tweak/block-page-no-password
6 years ago
Adam Warner
30a2923380
Merge pull request #1952 from smopucilowski/fixes
...
Trivial spelling mistakes in basic-install.sh comments
6 years ago
Sebastian Pucilowski
c5a2ca5c98
Trivial spelling mistakes in basic-install.sh comments
...
Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>
6 years ago
Dan Schaper
9f2ce0e296
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity
...
Potential fix for #1909
6 years ago
Adam Warner
55e10d8287
replace another grep -F as pointed out by @StarPicard
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Dan Schaper
94c772e1a8
Merge pull request #1936 from theel0ja/patch-fix-typo
...
Fixed a typo
6 years ago
Elias Ojala
2b6d9c34c9
Fixed a typo
...
Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>
6 years ago
Mcat12
1a5c86d32e
Revert "Hide password textbox if there is no password"
...
This reverts commit 009fa2f1b7
.
6 years ago
Mcat12
c7219fbdff
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password
6 years ago
DL6ER
4c249a1186
Flush most recent 24 hours from FTL's database
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
158ea1d43b
Add sqlite3 dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Mark Drobnak
535b8458d4
Merge pull request #1901 from bcambl/epel_check
...
Fix epel-release install for CentOS
6 years ago
Dan Schaper
49b3f82675
Merge pull request #1925 from pi-hole/feature/installtweaks
...
Install log security
6 years ago
Dan Schaper
9543203610
Echo the right location for the log.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago