529 Commits (8a90a47fc286ce036b2fbbff17081ea080dea8ea)

 

All Branches   

Search

Author	SHA1	Message	Date
CDeeRON	8a90a47fc2	ATV Hulu domain add ... added ads-e-darwin.hulu.com which I found to be used when serving ADs on ATV.	8 years ago
Adam Warner	c93c4cc5e6	Update basic-install.sh ... ahem	8 years ago
Promofaux	06cba7defd	Fix script output around new changes	8 years ago
Promofaux	8b76bbe51d	Merge github.com:pi-hole/pi-hole	8 years ago
Promofaux	aa1d3a4c2e	Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98	8 years ago
Adam Warner	66817411f9	Merge pull request #275 from pi-hole/development ... Release 2.5	8 years ago
Adam Warner	23c3196935	Merge pull request #277 from pi-hole/cosmeticFix ... Upstream DNS Whiptail changes	8 years ago
Dan Schaper	38e73a188a	Fix array selection	8 years ago
Dan Schaper	3fdf588cc9	Costmetic fixes, change DynDNS to OpenDNS	8 years ago
Adam Warner	9412fe8a0a	Delete version.txt ... @mcat12 said it's not needed anymore.	8 years ago
Adam Warner	c6450e60e1	Update version.txt ... Change version number to 2.5	8 years ago
Promofaux	8126e9f4b1	Merge branch 'master' into development	8 years ago
Promofaux	70e4104c17	Merge remote-tracking branch 'origin/development'	8 years ago
Promofaux	29e0e1760b	Fixes #154 #269. No need for PR #214 any more.	8 years ago
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.	8 years ago
Dan Schaper	548153fd5e	Merge pull request #270 from ChadBHowell/patch-1 ... Add error checking for grep and correct typos	8 years ago
Chad Howell	5060ed8970	Add error checking for grep and correct typos	8 years ago
Dan Schaper	d18e064d21	Remove no longer needed change to config file ... Config file moved, no longer needed command removed.	8 years ago
Mcat12	0cfb3c7ab4	Fixed config issue	8 years ago
Mcat12	2e0c2f2e77	Merge pull request #268 from pi-hole/licenseUpdate ... Updated License	8 years ago
Mcat12	48f9a61ff0	Updated License	8 years ago
Mcat12	0042e3ae02	Merge branch 'development' into CBH/UpstreamDNS ... Conflicts: automated install/basic-install.sh	8 years ago
Jacob Salmela	a1204cf246	splunk app	8 years ago
Mcat12	fc499d9e7c	Merge pull request #266 from pi-hole/coverage ... splunk app	8 years ago
Jacob Salmela	b83704dac2	splunk app	8 years ago
Adam Warner	b93e46de14	Update basic-install.sh	8 years ago
Promofaux	3c49aa9d9d	Merge remote-tracking branch 'origin/master' into development	8 years ago
Promofaux	a448b48eaf	Merge remote-tracking branch 'origin/master'	8 years ago
Adam Warner	3c6551f202	Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting ... Cbh/bugfix/formatting	8 years ago
Promofaux	9e0c7ed29a	Merging from CBH bugfix	8 years ago
Promofaux	677293f3a9	Merge branch 'CBH/Bugfix/Formatting'	8 years ago
Promofaux	34bd7ce3a7	Merge branch 'master' into CBH/Bugfix/Formatting	8 years ago
Adam Warner	21a07e7419	Merge pull request #263 from pi-hole/newVersioning ... New versioning system	8 years ago
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	8 years ago
Mcat12	895647b908	Don't copy version to install dir	8 years ago
Mcat12	0ece58b9cb	Add version	8 years ago
Mcat12	49a56cf131	Start on new versioning	8 years ago
PromoFaux	5fa0d798e2	Update README.md ... Add link to segment on MSDN/Channel 9's Defrag Show	8 years ago
Dan Schaper	cadc506aa5	Remove extraneous whitespace from basic-install.sh	8 years ago
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	8 years ago
Promofaux	52b5d7143b	Merge branch 'development'	8 years ago
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.	8 years ago
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	8 years ago
Promofaux	5111880edf	remove erroneous -o	8 years ago
Promofaux	3d78b44a8e	Changes as in #253, but with less commits to keep the repo tidy	8 years ago
Promofaux	f2d71d41a8	Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity ... Conflicts: automated install/basic-install.sh	8 years ago
Promofaux	b75b290351	adlists.default copied on each run of gravity. In case it has been overwritten	8 years ago
Promofaux	701ae06e4a	Move copying of adlists.default to gravity.sh	8 years ago
PromoFaux	edd0b809b7	Merge pull request #254 from pi-hole/master ... a	8 years ago
PromoFaux	98a0d17431	Update basic-install.sh ... Emergency Bug fix. I take the blame for this one, it got lost in a merge!	8 years ago