arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity
963 Commits 9 Branches 109 Tags 20 MiB
f6ac0d73b4
Commit Graph

963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Promofaux
f6ac0d73b4 Add force delete option 2016-08-17 19:08:55 +01:00
Promofaux
ae47be0ce9 Add HelpFunc 2016-08-17 18:59:00 +01:00
Adam Warner
f49ca48a22 Merge pull request #607 from pi-hole/Debug_Options 
Debug options
 2016-08-05 12:54:55 +01:00
Promofaux
9cb4e8bde8 Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options 
# Conflicts:
#	automated install/basic-install.sh
 2016-08-05 12:53:08 +01:00
Adam Warner
95edb49bb8 Add option for uploading debug log to termbin 2016-08-05 12:47:57 +01:00
Dan Schaper
fb69bf551e Merge pull request #593 from bcambl/sysconfig_gateway 
add gateway to interface configuration
 2016-08-04 00:26:07 -07:00
bcambl
fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway 2016-08-03 19:26:53 -06:00
Mcat12
acc5fa2a95 Merge pull request #609 from pi-hole/CLI_VersionCheck 
Cli version check
 2016-08-03 21:21:30 -04:00
Mcat12
f2e33f8581 Merge branch 'development' into CLI_VersionCheck 2016-08-03 21:21:23 -04:00
Adam Warner
4748cdc2c9 Merge pull request #599 from pi-hole/PullApprove 
Add PullApprove configuration
 2016-08-04 00:14:00 +01:00
Promofaux
2bc364023a Remove erroneous space in chmod command 
Fix spacing in help function
 2016-08-02 23:51:53 +01:00
Dan Schaper
3070f61e20 Merge branch 'development' into PullApprove 2016-08-02 14:55:47 -07:00
Promofaux
57df56dc62 Add version.sh to the install script 2016-08-02 20:08:21 +01:00
Promofaux
e11ef5a7f0 Add version display script. Also checks current version on web and reports version. 2016-08-02 20:07:09 +01:00
Promofaux
6a17a3eeec Add command to pihole script 2016-08-02 19:44:11 +01:00
Promofaux
66ff9a24c6 Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing... 2016-08-01 21:54:42 +01:00
Adam Warner
a3b3a7a34d Add option for uploading debug log to termbin 2016-08-01 21:43:13 +01:00
Mcat12
c04b3559d0 Merge pull request #584 from diginc/development 
Only re-block whitelist deletions if in adlists
 2016-07-31 14:39:05 -04:00
Dan Schaper
e642b41b5b Add PullApprove configuration 2016-07-29 16:35:26 -07:00
Dan Schaper
ba6881d685 Merge pull request #595 from pi-hole/fix/README_Update 
Typo/Linter fix
 2016-07-29 13:13:24 -07:00
Dan Schaper
20d8c9053b Remove defunct Optimal link 
Optimal has discontinued it's app program. Removing dead link
 2016-07-29 13:05:15 -07:00
Dan Schaper
0749e4ed70 Move BountySource to top position 2016-07-27 18:58:05 -07:00
Dan Schaper
b0cc69ff80 Merge Conflict resolution 2016-07-27 18:54:41 -07:00
Dan Schaper
02c4669e95 Typo/Linter fix 
Fix a few typo's, run through linter for format corrections.
 2016-07-26 20:46:43 -07:00
bcambl
8550b76e23 add gateway to interface configuration 2016-07-24 22:42:06 -06:00
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