Promofaux
|
29e0e1760b
|
Fixes #154 #269. No need for PR #214 any more.
|
2016-01-31 20:39:12 +00:00 |
|
Dan Schaper
|
442b7b4c4d
|
Merge pull request #267 from pi-hole/CBH/UpstreamDNS
Upstream DNS is now user configurable. Configuration files are now stored in sub-directories instead of as replacements to the package configs.
|
2016-01-30 18:09:00 -08:00 |
|
Dan Schaper
|
548153fd5e
|
Merge pull request #270 from ChadBHowell/patch-1
Add error checking for grep and correct typos
|
2016-01-30 17:53:20 -08:00 |
|
Chad Howell
|
5060ed8970
|
Add error checking for grep and correct typos
|
2016-01-30 20:51:28 -05:00 |
|
Dan Schaper
|
d18e064d21
|
Remove no longer needed change to config file
Config file moved, no longer needed command removed.
|
2016-01-30 16:30:38 -08:00 |
|
Mcat12
|
0cfb3c7ab4
|
Fixed config issue
|
2016-01-30 19:21:31 -05:00 |
|
Mcat12
|
2e0c2f2e77
|
Merge pull request #268 from pi-hole/licenseUpdate
Updated License
|
2016-01-30 15:21:53 -05:00 |
|
Mcat12
|
48f9a61ff0
|
Updated License
|
2016-01-30 15:12:40 -05:00 |
|
Mcat12
|
0042e3ae02
|
Merge branch 'development' into CBH/UpstreamDNS
Conflicts:
automated install/basic-install.sh
|
2016-01-30 13:28:01 -05:00 |
|
Jacob Salmela
|
a1204cf246
|
splunk app
|
2016-01-30 12:36:56 -05:00 |
|
Mcat12
|
fc499d9e7c
|
Merge pull request #266 from pi-hole/coverage
splunk app
|
2016-01-30 12:31:55 -05:00 |
|
Jacob Salmela
|
b83704dac2
|
splunk app
|
2016-01-30 10:20:01 -06:00 |
|
Adam Warner
|
b93e46de14
|
Update basic-install.sh
|
2016-01-30 14:55:02 +00:00 |
|
Promofaux
|
3c49aa9d9d
|
Merge remote-tracking branch 'origin/master' into development
|
2016-01-30 14:38:49 +00:00 |
|
Promofaux
|
a448b48eaf
|
Merge remote-tracking branch 'origin/master'
|
2016-01-30 14:38:33 +00:00 |
|
Adam Warner
|
3c6551f202
|
Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting
Cbh/bugfix/formatting
|
2016-01-30 14:37:02 +00:00 |
|
Promofaux
|
9e0c7ed29a
|
Merging from CBH bugfix
|
2016-01-30 14:34:12 +00:00 |
|
Promofaux
|
677293f3a9
|
Merge branch 'CBH/Bugfix/Formatting'
|
2016-01-30 14:29:52 +00:00 |
|
Promofaux
|
34bd7ce3a7
|
Merge branch 'master' into CBH/Bugfix/Formatting
|
2016-01-30 14:29:01 +00:00 |
|
Adam Warner
|
21a07e7419
|
Merge pull request #263 from pi-hole/newVersioning
New versioning system
|
2016-01-29 20:47:10 +00:00 |
|
Adam Warner
|
6b50ea6504
|
Merge pull request #249 from pi-hole/OperationBlockListFromGravity
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
|
2016-01-29 19:39:11 +00:00 |
|
Mcat12
|
895647b908
|
Don't copy version to install dir
|
2016-01-29 12:32:58 -05:00 |
|
Mcat12
|
0ece58b9cb
|
Add version
|
2016-01-29 12:23:03 -05:00 |
|
Mcat12
|
49a56cf131
|
Start on new versioning
|
2016-01-29 08:25:35 -05:00 |
|
PromoFaux
|
5fa0d798e2
|
Update README.md
Add link to segment on MSDN/Channel 9's Defrag Show
|
2016-01-28 10:13:55 +00:00 |
|
Dan Schaper
|
cadc506aa5
|
Remove extraneous whitespace from basic-install.sh
|
2016-01-28 09:25:00 +00:00 |
|
Chad Howell
|
eee0ccef8c
|
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2
|
2016-01-27 22:44:14 -05:00 |
|
Chad Howell
|
088bd632ab
|
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
# Conflicts:
# automated install/basic-install.sh
|
2016-01-27 22:43:43 -05:00 |
|
Promofaux
|
52b5d7143b
|
Merge branch 'development'
|
2016-01-27 23:48:24 +00:00 |
|
PromoFaux
|
60bf14d4dd
|
Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
|
2016-01-27 23:43:38 +00:00 |
|
Promofaux
|
c00fb44cee
|
Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run
|
2016-01-27 23:28:36 +00:00 |
|
Promofaux
|
5111880edf
|
remove erroneous -o
|
2016-01-27 22:35:52 +00:00 |
|
Promofaux
|
3d78b44a8e
|
Changes as in #253, but with less commits to keep the repo tidy
|
2016-01-27 22:32:08 +00:00 |
|
Promofaux
|
f2d71d41a8
|
Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity
Conflicts:
automated install/basic-install.sh
|
2016-01-27 21:16:35 +00:00 |
|
Promofaux
|
b75b290351
|
adlists.default copied on each run of gravity. In case it has been overwritten
|
2016-01-27 21:14:23 +00:00 |
|
Promofaux
|
701ae06e4a
|
Move copying of adlists.default to gravity.sh
|
2016-01-27 21:14:06 +00:00 |
|
PromoFaux
|
edd0b809b7
|
Merge pull request #254 from pi-hole/master
a
|
2016-01-27 15:47:54 +00:00 |
|
PromoFaux
|
98a0d17431
|
Update basic-install.sh
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
|
2016-01-27 15:28:40 +00:00 |
|
PromoFaux
|
b1bd56cd51
|
Update basic-install.sh
|
2016-01-27 09:47:28 +00:00 |
|
Chad Howell
|
ae336da7a1
|
Fix formatting, use consistent style, add comments
Fix formatting, use consistent style, add comments
|
2016-01-27 01:11:38 -05: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
|
ef99fe2d18
|
Add line to copy default ad list into /etc/pihole
|
2016-01-26 20:33:49 +00:00 |
|
Promofaux
|
352ebc3193
|
outsource list of adlists to a file in /etc/pihole/.
|
2016-01-26 20:26:09 +00:00 |
|
Promofaux
|
556799428c
|
Contains default adlists.
|
2016-01-26 20:22:29 +00:00 |
|
Dan Schaper
|
0b077b9601
|
Merge pull request #244 from pi-hole/development
Code update for 2016/01/25.
|
2016-01-25 11:04:09 -08:00 |
|
PromoFaux
|
80bec9c5cf
|
Delete install
Not sure how this got in here... :)
|
2016-01-25 16:28:26 +00:00 |
|
PromoFaux
|
c24685c49a
|
Merge pull request #243 from pi-hole/HotFix/InstallScript
Hot fix/install script
|
2016-01-25 16:22:36 +00:00 |
|
Adam Warner
|
2b99fa81f3
|
Tidy up output lines around new code
|
2016-01-25 16:08:48 +00:00 |
|
Adam Warner
|
e87443b3e4
|
add 'http://mirror1.malwaredomains.com/files/justdomains' to list of ad-list sources, can be removed if it causes problems
|
2016-01-25 15:53:49 +00:00 |
|
Adam Warner
|
74ea597bd8
|
Cosmetic enhancement. Add the domain 'Pi-Hole.IsWorking.OK' to the top of the domain list to return a friendlier looking domain when pinging a blocked host!
|
2016-01-25 15:52:22 +00:00 |
|