Commit Graph

13 Commits

Author SHA1 Message Date
nate a0cf93a7ca Merge branch 'PiholeDebug'
Conflicts:
	README.md
2016-03-28 12:22:42 -05:00
Dan Schaper 3eaa447323 Merge pull request #369 from jpsingleton/development
Optionally block the BBC Breaking News banner
2016-03-08 00:28:18 -08:00
Stefan Joosten 122ce11381 Fix URL for Windows 10 Telemetry list. 2016-03-08 00:23:39 +01:00
James Singleton 8cbd9f7f08 Optionally block the BBC Breaking News banner 2016-03-07 13:31:50 +00:00
Carter Maxwell 613ab9febc remove trailing whitespace adlists.default 2016-03-05 21:13:23 -08:00
Adam Warner 52549d51ab Update adlists.default
Add extra warning regarding mahakala.is list. See comment by @leichterleben in #341
2016-02-22 09:24:17 +00:00
Mcat12 592af80659 Update adlists.default 2016-02-21 14:19:57 -05:00
Promofaux 13777cc1aa update default list to include StevenBlack's amalgamated list (remove seperate lists included in that list). Take advantage of new support for commenting and blank lines 2016-02-21 18:12:57 +00:00
Mcat12 c4fc2e089d Removed dead list
Fixes #316
2016-02-15 17:36:59 -05:00
Adam Warner f8897942f3 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
2016-02-15 19:26:39 +00:00
Promofaux b2fbf46e60 Added more adlists to the defaults. By default we now block ~ 155,600 ad and tracker domains. Includes NoTrack's tracker list. 2016-02-09 20:43:45 +00:00
PromoFaux 4a61b80dd6 Update adlists.default
Add new line to end of file.. Github was complaining
2016-01-26 23:14:38 +00:00
Promofaux 556799428c Contains default adlists. 2016-01-26 20:22:29 +00:00