Daniel (Fourdee)
e9a0ddf798
Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development
2016-08-25 12:09:54 +01:00
Dan Schaper
4f5fcc2a37
Merge pull request #626 from victmo/development
...
Added window.close() to index.html
2016-08-22 16:43:49 -07:00
Victor Marquez
0121136498
Added window.close() to index.html
...
Adding window.close() will automatically close any pop-ups that might get loaded with a blocked ad.
2016-08-19 20:45:17 -04:00
Dan Schaper
6f0b659b38
Merge pull request #623 from pi-hole/AddForceClearToGravity
...
Add force clear to gravity
2016-08-17 11:32:35 -07:00
Dan Schaper
652bdf1518
Merge branch 'development' into AddForceClearToGravity
2016-08-17 11:32:26 -07:00
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
Mcat12
491c37eafe
Merge pull request #613 from goldbattle/development
...
Added - Readme Windows Tray App
2016-08-14 17:20:25 -04:00
Patrick Geneva
3ade7a8b0e
Added - Readme Windows Tray App
2016-08-14 17:18:24 -04:00
Dan Schaper
3c7738b6d0
Merge pull request #619 from Fourdee/development
...
Free Disk Space check standardization
2016-08-13 19:44:40 -07:00
Daniel (Fourdee)
037318e2ff
Provide non-zero exit code, as per existing sourcecode.
2016-08-12 13:20:30 +01:00
Daniel (Fourdee)
a9a499939e
Fourdee - See notes:
...
https://github.com/pi-hole/pi-hole/issues/602
+ Improve available free disk space check.
+ Option to override if the free disk space check is not a valid
integer.
2016-08-12 12:44:45 +01:00
Daniel (Fourdee)
7e5bcd2ec3
Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development
2016-08-12 12:11:55 +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