Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-27 16:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
5738 commits 8 branches 109 tags 27 MiB
Commit graph

5738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Warner
fdf27e3d24 Merge pull request #573 from bcambl/centos-nc 
fix centos nc dependency
 2016-07-22 19:02:29 +01:00
Adam Warner
069023fca2 Merge pull request #589 from pi-hole/PromoFaux-patch-1 
Update README.md
 2016-07-22 14:14:07 +01:00
Adam Warner
1fd6648db1 Merge pull request #591 from pi-hole/master 
Out of Sync with master
 2016-07-22 12:04:15 +01:00
Adam Warner
7a08c8b694 Merge pull request #590 from pi-hole/revert-588-master 
Revert "Development out of sync with master."
 2016-07-22 12:03:17 +01:00
Adam Warner
60aad3f19b Revert "Development out of sync with master." 2016-07-22 11:59:19 +01:00
Adam Warner
51dcc2bc0f Update README.md 
Add badge for bountysource to show avtive bounties.
 2016-07-22 11:56:54 +01:00
Adam Warner
941525d1e0 Development out of sync with master. (#588) 
* adding links to optimal.com

Also added image of Pi-hole's stats from Optimal.com and a bitcoin donation address per some user requests.

* simplified and new additions

I tried to simplify the readme page a bit.  I also added some new links to some helper videos and added some screenshots of the whitelist editor.

* updated dashboard pic

* Update README.md

* simplified donation section

* forgot to remove the old donation stuff

* Hosts-file.net moved to https

* removed pihole berry from images

also added adafruit livestream video

* Update README.md

update "How does it work" video
 2016-07-22 11:54:17 +01:00
diginc
5fb6c5b012 Making the whitelist re-block echo consistent with other WL/BL echos 2016-07-20 12:53:31 -05:00
diginc
3affa73257 Only re-block whitelist deletions if in adlists 
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
 2016-07-20 12:43:30 -05:00
Blayne Campbell
c647e27e15 Merge branch 'development' into centos-nc 2016-07-19 08:48:54 -06:00
Dan Schaper
f696ed48b3 Merge pull request #570 from pi-hole/bugfix/dhcpcd_comments 
Change comment to hash
 2016-07-18 16:32:12 -07:00
Adam Warner
73645f299a Merge branch 'development' into bugfix/dhcpcd_comments 2016-07-18 14:37:38 +01:00
Mcat12
6aeb5f1172 Merge pull request #575 from pi-hole/bugfix/distrib_vers_check 
Remove trailing slash on os-release check
 2016-07-17 07:37:55 -04:00
Dan Schaper
ce8f07750f Remove trailing slash on os-release check 
Fixes #CLOSED 

Remove trailing slash that would cause an os-check to always fail out.
 2016-07-15 22:46:21 -07:00
bcambl
a32ad0dbf2 fix centos nc dependency 2016-07-15 21:43:23 -06:00
Promofaux
61ff12e8d4 Change header to match the rest of the scripts. 2016-07-15 21:17:16 +01:00
Adam Warner
02b0e96db8 Merge pull request #572 from pi-hole/development 
Dan forgot this : `}`
 2016-07-15 21:13:10 +01:00
Promofaux
e942440bb7 Dan forgot this : } 2016-07-15 21:11:10 +01:00
Dan Schaper
a27f1f17de Merge pull request #563 from pi-hole/development 
Push to release 2.8 - Gold
 2016-07-15 12:05:20 -07:00
Promofaux
e106ff0fef Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE. 2016-07-15 19:58:26 +01:00
Promofaux
6f068e0b9c Replace sprunge.us with termbin, which appears to be more reliable. 2016-07-15 19:32:49 +01:00
Dan Schaper
ada531c88a Merge pull request #568 from pi-hole/feature/Distro-Check 
Add distribution Check
 2016-07-15 11:05:54 -07:00
Dan Schaper
f0a2248c81 Change comment to hash 
Change format of comment to hash/octothorpe to clearly delineate that it's a comment. Looks better than `:::` which causes confusion.
 2016-07-15 10:27:40 -07:00
Sander
11f2524b9b Instead of an or, cat *release 2016-07-14 20:47:27 +02:00
Dan Schaper
b011e5f838 Add os-release check 2016-07-14 11:35:52 -07:00
Dan Schaper
f45eb84d6b Add distribution Check 2016-07-14 11:27:47 -07:00
Adam Warner
412c0a172d Update README.md 
update "How does it work" video
 2016-07-08 22:58:27 +01:00
Jacob Salmela
c1d8496b93 removed pihole berry from images 
also added adafruit livestream video
 2016-07-06 08:37:30 -05:00
Mcat12
4657959790 Merge pull request #559 from dan019/repair-apt 
Repairs apt-get incorrect options
 2016-07-04 16:22:36 -04:00
Daniel
2b0ba281a4 Repairs apt-get incorrect options 2016-07-04 15:35:46 -04:00
Mcat12
325a41c598 Merge pull request #558 from dan019/easy-log 
Upload log to sprunge.us
 2016-07-03 22:08:25 -04:00
Daniel
9b8efe1b27 Upload log to sprunge.us 2016-07-03 19:50:42 -04:00
Dan Schaper
024b741552 Merge pull request #490 from bcambl/fedora-armhf7 
Fedora Support
 2016-06-29 14:25:23 -07:00
Mcat12
4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect 
Have `curl` auto-redirect
 2016-06-26 13:42:40 -04:00
Mcat12
a86b982591 Merge pull request #537 from pi-hole/piholeIP-Permissions 
Missing permissions when writing to piholeIP
 2016-06-26 13:23:28 -04:00
Mcat12
ec8da00485 Merge pull request #545 from mat1th/feature/new-block-list 
Feature/new blocklist url
 2016-06-26 13:20:25 -04:00
Dan Schaper
bcfe130d51 Merge pull request #544 from pi-hole/Fix/MahaUA 
Mahakala User Agen modernization
 2016-06-25 13:20:04 -07:00
Matth
0e143f7275 Update adlists.default 2016-06-25 15:45:51 +02:00
Dan Schaper
7670b4e380 Mahakala User Agen modernization 
Update Curl User Agent for Maha list.
 2016-06-25 06:00:49 -07:00
Dan Schaper
636a9123b8 Have curl auto-redirect 
This should solve the redirection issue if a list is moved.
 2016-06-23 18:37:45 -07:00
Dan Schaper
caaee40889 Hosts-file.net moved to https 2016-06-23 17:38:26 -07:00
Mcat12
1f130b6550 Fix missing permissions on piholeIP 
Without sudo/root privileges, the echo command is unable to write
to the file.
 2016-06-21 19:16:11 -04:00
Jacob Salmela
2ce47f49b1 forgot to remove the old donation stuff 2016-06-20 15:55:23 -05:00
Jacob Salmela
0250e03b86 simplified donation section 2016-06-20 15:47:05 -05:00
Adam Warner
ce110aab90 Merge pull request #536 from fhemberger/development 
Fix link for spam404scamlist.txt
 2016-06-20 18:47:12 +01:00
Frederic Hemberger
fd92752f52 Fix link for spam404scamlist.txt 
The redirect `http://spam404bl.com/spam404scamlist.txt` resolves to `https://raw.githubusercontent.com/spam404scamlist.txt/Dawsey21/Lists/master/main-blacklist.txt`, which is wrong.

Instead, use `https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt`directly.
 2016-06-20 19:37:58 +02:00
Adam Warner
3c4a305976 Update README.md 2016-06-17 16:05:17 +01:00
Adam Warner
791e5bbd55 Merge pull request #531 from pi-hole/malwareList 
Update adlists.default
 2016-06-16 10:12:30 +01:00
Adam Warner
46df6e7dd3 Update adlists.default 
Add C&C malware list from #528
 2016-06-16 10:11:55 +01:00
Jacob Salmela
9ccf9d57a8 updated dashboard pic 2016-06-13 06:49:03 -05:00