From 68a9b88b58ebbe59870f7316f64d386d94529ccd Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sun, 14 Feb 2016 10:20:02 -0600 Subject: [PATCH 1/9] docker container for Pi-hole --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7e938834..207375f2 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei [![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232) ## Pi-hole Projects +- [x86 Docker container that runs Pi-hole](https://hub.docker.com/r/diginc/pi-hole/) - [Pi-hole Chrome extension](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([open source](https://github.com/packtloss/pihole-extension)) - [Go Bananas for CHiP-hole ad blocking](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037) - [Sky-Hole](http://dlaa.me/blog/post/skyhole) From f8897942f3e7e13335247af7a7ada666349a000f Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 15 Feb 2016 19:26:39 +0000 Subject: [PATCH 2/9] Update adlists.default Remove 'securemecca.com` list, as they block other content, not just ads and malware. Pi-hole is about ad-blocking and privacy, not about censoring content. See :https://www.reddit.com/r/pihole/comments/45xuh8/slug/d00xg02 --- adlists.default | 2 -- 1 file changed, 2 deletions(-) diff --git a/adlists.default b/adlists.default index c2385f7e..b8932eb2 100644 --- a/adlists.default +++ b/adlists.default @@ -6,7 +6,6 @@ http://pgl.yoyo.org/adservers/serverlist.php? http://someonewhocares.org/hosts/hosts http://winhelp2002.mvps.org/hosts.txt http://mirror1.malwaredomains.com/files/justdomains -http://securemecca.com/Downloads/hosts.txt https://hosts.neocities.org/ http://sysctl.org/cameleon/hosts https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist @@ -14,4 +13,3 @@ https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt http://optimate.dl.sourceforge.net/project/adzhosts/HOSTS.txt https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt - From c4fc2e089d78daef76a10fb60eb10f568013b956 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 15 Feb 2016 17:36:59 -0500 Subject: [PATCH 3/9] Removed dead list Fixes #316 --- adlists.default | 1 - 1 file changed, 1 deletion(-) diff --git a/adlists.default b/adlists.default index b8932eb2..cf5ca45b 100644 --- a/adlists.default +++ b/adlists.default @@ -6,7 +6,6 @@ http://pgl.yoyo.org/adservers/serverlist.php? http://someonewhocares.org/hosts/hosts http://winhelp2002.mvps.org/hosts.txt http://mirror1.malwaredomains.com/files/justdomains -https://hosts.neocities.org/ http://sysctl.org/cameleon/hosts https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt From 9ad7c12710c75ca50b243585e8a2af5582e97edd Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:15:33 +0000 Subject: [PATCH 4/9] Create PULL_REQUEST_TEMPLATE --- .github/PULL_REQUEST_TEMPLATE | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 00000000..1a2aa1ab --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,6 @@ +Fixes #[issue number] . + +Changes proposed in this pull request: +- +- +- From 6581f119fd1fdf5328ab1f0e20d33fdd21803fed Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:16:04 +0000 Subject: [PATCH 5/9] Update PULL_REQUEST_TEMPLATE --- .github/PULL_REQUEST_TEMPLATE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 1a2aa1ab..c9ec842a 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -4,3 +4,5 @@ Changes proposed in this pull request: - - - + +@pihole/gravity From b1515c5e3fa679edbe4fe77b410baafde073757c Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:17:20 +0000 Subject: [PATCH 6/9] Rename PULL_REQUEST_TEMPLATE to PULL_REQUEST_TEMPLATE.md --- .github/{PULL_REQUEST_TEMPLATE => PULL_REQUEST_TEMPLATE.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{PULL_REQUEST_TEMPLATE => PULL_REQUEST_TEMPLATE.md} (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE rename to .github/PULL_REQUEST_TEMPLATE.md From 6530ec58c7ae117e722ea9c03efcd1c27ba7863e Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:18:43 +0000 Subject: [PATCH 7/9] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c9ec842a..8b924ac2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,12 @@ Fixes #[issue number] . -Changes proposed in this pull request: -- -- + +#####Changes proposed in this pull request: + - +- + +- + @pihole/gravity From 950480bb776f73fd731ece61dd12c02d40e3d166 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:20:01 +0000 Subject: [PATCH 8/9] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8b924ac2..071fdf89 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,9 +1,8 @@ Fixes #[issue number] . +Changes proposed in this pull request: -#####Changes proposed in this pull request: - -- +- - From 5f9e5869e94048488118aaae89c3a37b8a09306b Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 17 Feb 2016 22:23:01 +0000 Subject: [PATCH 9/9] Create ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..04303614 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,7 @@ +##### Expected Behaviour: + + +##### Actual Behaviour: + + +##### Steps to reproduce this issue: