952f1271b4
Do not require DCO for Pi-hole Org members with GPG signed commits.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-04-11 10:13:09 -07:00
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
...
adlists.default no longer used. No need to reference it.
2018-04-06 00:17:45 -04:00
1200a77b22
Merge pull request #2075 from everettsouthwick/development
...
Add support for public Cloudflare DNS servers.
2018-04-02 00:03:50 -04:00
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
...
Proper output for debug CPU detection
2018-04-02 00:00:14 -04:00
a8b493cb7d
Add support for public Cloudflare DNS servers.
...
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
2018-04-01 17:59:16 -05:00
971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1
...
Add RaspberryPi 3B+ to Chronometer
2018-03-30 17:42:50 -04:00
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
...
basic-install.sh - no CIDR in ifcfg-*
2018-03-30 17:28:52 -04:00
a97e361661
Merge pull request #2061 from dflamand/development
...
Remove dead link from CONTRIBUTING.md
2018-03-28 20:10:11 -07:00
34d84522dd
Merge pull request #2054 from theLMGN/patch-1
...
Link to the admin panel on the splash page.
2018-03-28 20:08:39 -07:00
3390fbf238
Add RaspberryPi 3B+
...
Signed-off-by: Perflyst <mail@perflyst.de>
2018-03-27 12:23:01 +02:00
98ad1feaeb
Merge pull request #2060 from pi-hole/tweak/debug-xheader
...
add label to x-header so you know which one is being evaluated
2018-03-26 13:23:31 -04:00
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>
2018-03-25 21:59:35 -07:00
68c27eb2a1
add label to x-header so you know which one is being evaluated
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-25 21:27:40 -05:00
d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
...
Remove PA YAML file
2018-03-23 22:16:12 -04:00
bfcbd72e4b
Link to the admin panel on the splash page.
2018-03-23 16:17:31 +00:00
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
2018-03-21 17:47:24 -04:00
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
2018-03-10 17:36:47 -06:00
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.
2018-03-10 17:33:31 -06:00
71d8f5f96f
remove PA YAML file
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:00:14 +00:00
856a2096eb
Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch
...
Store checked out FTL branch in /etc/pihole/ftlbranch
2018-03-07 21:51:52 +00:00
76cb129d3c
don't forget `master` and `development` branches!
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:48:09 +00:00
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:41:00 +00:00
aed20cf7c6
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
...
Gravity falls over when there is no whitelist file
2018-03-06 20:39:32 +00:00
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>
2018-03-06 18:29:28 +00:00
e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
...
Bugfix mktmp > mktemp
2018-03-02 16:03:11 -05:00
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-03-02 12:28:53 -08:00
6011dd7372
Merge pull request #2000 from pi-hole/fix/FTL_Install
...
Use pushd/popd and create random temporary directory
2018-02-26 21:55:12 -08:00
41d9d57c84
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
...
Specifty `LC_ALL=C` when dealing with sorted lists.
2018-02-24 07:22:44 -08:00
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>
2018-02-22 20:13:38 -08:00
e61d8e4fb8
adlists.default no longer used. No need to reference it.
...
Use --force switch of gravity to force the cache refresh
Signed-off-by: Adam Warner <adamw@rner.email>
2018-02-22 14:45:31 +00:00
6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-02-21 11:33:29 +00:00
d4ac818a0b
Specifty `LC_ALL=C` when dealing with sorted lists.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-02-21 11:23:07 +00:00
c17d95bfed
Proper output for debug CPU detection
...
Inserted "log_write" to properly output CPU detection lines.
Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
2018-02-19 10:22:28 -05:00
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
2018-02-18 15:32:01 -05:00
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
2018-02-18 21:20:04 +01:00
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
2018-02-18 12:51:46 -05:00
40bda4b3d1
Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service
...
Always replace pihole-FTL.service
2018-02-18 17:26:17 +01:00
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>
2018-02-18 14:19:49 +01:00
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-18 13:07:22 +01:00
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +01:00
b8eaa9a527
Use double quotes to precent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-17 13:01:00 +01:00
5d274008db
Use possibly user-defined database location when flushing
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-17 12:58:57 +01:00
220e755596
Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting
...
Don't auto-whitelist blocking list domains
2018-02-17 12:23:14 +01:00
fc5034696d
Don't auto-whitelist blocking list domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-16 19:42:33 +01:00
4a6f77bc59
Merge pull request #1967 from pi-hole/master
...
Git flow Pi-hole v3.3
2018-02-15 21:09:22 +01:00
1e87850952
Merge pull request #1943 from pi-hole/release/3.3
...
Pi-hole v3.3
2018-02-14 12:48:40 -08:00
3472241289
Merge pull request #1962 from floek/master
...
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-14 13:02:56 -05:00
a944b6ff79
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-12 21:28:43 +01:00
6c4741bc61
Merge pull request #1730 from pi-hole/tweak/block-page-no-password
...
Disable password field on block page if no password is set
2018-02-11 22:15:20 -05:00
8a42ef431b
Fix Javascript warning when no password is set
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-02-11 21:49:12 -05:00
Dan Schaper
Mark Drobnak
Everett Southwick
Dan Schaper
Perflyst
Dillon Flamand
Jacob Salmela
Leo MG Nesfield (LMGN)
justinamcafee
Adam Warner
Adam Warner
Ryan Knapper
Ludovic Rousseau
DL6ER
DL6ER
Florian Freund