Commit Graph

3068 Commits (37e8a91d5bdfce3f6fff43f471fb265e4f68c510)
 

Author SHA1 Message Date
Dillon Flamand 37e8a91d5b
Remove dead link from CONTRIBUTING.md
6 years ago
Mark Drobnak d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
6 years ago
Mark Drobnak e131395cce
Merge pull request #2037 from justinamcafee/master
6 years ago
justinamcafee 30af6e73be
added ;; to line 825
6 years ago
justinamcafee 2895b9bfb7
Added support for FamilyShield from OpenDNS
6 years ago
Adam Warner 71d8f5f96f
remove PA YAML file
6 years ago
Adam Warner 856a2096eb
Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch
6 years ago
Adam Warner 76cb129d3c
don't forget `master` and `development` branches!
6 years ago
Adam Warner 246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
6 years ago
Adam Warner aed20cf7c6
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
6 years ago
Adam Warner ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
6 years ago
Mark Drobnak e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
6 years ago
Dan Schaper 3425b9a82e
Fix mktmp > mktemp
6 years ago
Dan Schaper 6011dd7372
Merge pull request #2000 from pi-hole/fix/FTL_Install
6 years ago
Dan Schaper 41d9d57c84
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
6 years ago
Dan Schaper 4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
6 years ago
Adam Warner 6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
6 years ago
Adam Warner d4ac818a0b
Specifty `LC_ALL=C` when dealing with sorted lists.
6 years ago
Mark Drobnak f14184df30
Merge pull request #1982 from LudovicRousseau/master
6 years ago
Ludovic Rousseau 47bbea9ba7 Use " " to protect parameter substitution
6 years ago
Mark Drobnak 7265935cd4
Merge pull request #1915 from ryanknapper/development
6 years ago
DL6ER 40bda4b3d1
Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service
6 years ago
Ludovic Rousseau b7891f92a5 Create blacklist.txt if not existant
6 years ago
DL6ER 8b79017d0f
Always replace pihole-FTL.service
6 years ago
DL6ER 5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
6 years ago
DL6ER b8eaa9a527
Use double quotes to precent globbing and word splitting
6 years ago
DL6ER 5d274008db
Use possibly user-defined database location when flushing
6 years ago
DL6ER 220e755596
Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting
6 years ago
DL6ER fc5034696d
Don't auto-whitelist blocking list domains
6 years ago
DL6ER 4a6f77bc59
Merge pull request #1967 from pi-hole/master
6 years ago
Dan Schaper 1e87850952
Merge pull request #1943 from pi-hole/release/3.3
6 years ago
Mark Drobnak 3472241289
Merge pull request #1962 from floek/master
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
6 years ago
Mcat12 8a42ef431b
Fix Javascript warning when no password is set
6 years ago
Mcat12 2cf1f0e8fc
Hide the password input when there is no password
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
6 years ago
Sebastian Pucilowski c5a2ca5c98 Trivial spelling mistakes in basic-install.sh comments
6 years ago
Dan Schaper 9f2ce0e296
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity
6 years ago
Adam Warner 55e10d8287
replace another grep -F as pointed out by @StarPicard
6 years ago
Dan Schaper 94c772e1a8
Merge pull request #1936 from theel0ja/patch-fix-typo
6 years ago
Elias Ojala 2b6d9c34c9 Fixed a typo
6 years ago
Mcat12 1a5c86d32e
Revert "Hide password textbox if there is no password"
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
6 years ago
DL6ER 158ea1d43b
Add sqlite3 dependency
6 years ago
Mark Drobnak 535b8458d4
Merge pull request #1901 from bcambl/epel_check
6 years ago
Dan Schaper 49b3f82675
Merge pull request #1925 from pi-hole/feature/installtweaks
6 years ago
Dan Schaper 9543203610
Echo the right location for the log.
6 years ago