Commit Graph

556 Commits (40f541bc31a23e49853f9536b809f4ab403d0baa)
 

Author SHA1 Message Date
Mcat12 fc499d9e7c Merge pull request #266 from pi-hole/coverage
9 years ago
Jacob Salmela b83704dac2 splunk app
9 years ago
Adam Warner b93e46de14 Update basic-install.sh
9 years ago
Promofaux 3c49aa9d9d Merge remote-tracking branch 'origin/master' into development
9 years ago
Promofaux a448b48eaf Merge remote-tracking branch 'origin/master'
9 years ago
Adam Warner 3c6551f202 Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting
9 years ago
Promofaux 9e0c7ed29a Merging from CBH bugfix
9 years ago
Promofaux 677293f3a9 Merge branch 'CBH/Bugfix/Formatting'
9 years ago
Promofaux 34bd7ce3a7 Merge branch 'master' into CBH/Bugfix/Formatting
9 years ago
Adam Warner 21a07e7419 Merge pull request #263 from pi-hole/newVersioning
9 years ago
Adam Warner 6b50ea6504 Merge pull request #249 from pi-hole/OperationBlockListFromGravity
9 years ago
Mcat12 895647b908 Don't copy version to install dir
9 years ago
Mcat12 0ece58b9cb Add version
9 years ago
Mcat12 49a56cf131 Start on new versioning
9 years ago
PromoFaux 5fa0d798e2 Update README.md
9 years ago
Dan Schaper cadc506aa5 Remove extraneous whitespace from basic-install.sh
9 years ago
Chad Howell 088bd632ab Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
9 years ago
Promofaux 52b5d7143b Merge branch 'development'
9 years ago
PromoFaux 60bf14d4dd Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
9 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
9 years ago
Promofaux 5111880edf remove erroneous -o
9 years ago
Promofaux 3d78b44a8e Changes as in #253, but with less commits to keep the repo tidy
9 years ago
Promofaux f2d71d41a8 Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity
9 years ago
Promofaux b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten
9 years ago
Promofaux 701ae06e4a Move copying of adlists.default to gravity.sh
9 years ago
PromoFaux edd0b809b7 Merge pull request #254 from pi-hole/master
9 years ago
PromoFaux 98a0d17431 Update basic-install.sh
9 years ago
PromoFaux b1bd56cd51 Update basic-install.sh
9 years ago
Chad Howell ae336da7a1 Fix formatting, use consistent style, add comments
9 years ago
PromoFaux 4a61b80dd6 Update adlists.default
9 years ago
Promofaux ef99fe2d18 Add line to copy default ad list into /etc/pihole
9 years ago
Promofaux 352ebc3193 outsource list of adlists to a file in /etc/pihole/.
9 years ago
Promofaux 556799428c Contains default adlists.
9 years ago
Dan Schaper 0b077b9601 Merge pull request #244 from pi-hole/development
9 years ago
PromoFaux 80bec9c5cf Delete install
9 years ago
PromoFaux c24685c49a Merge pull request #243 from pi-hole/HotFix/InstallScript
9 years ago
Adam Warner 2b99fa81f3 Tidy up output lines around new code
9 years ago
Adam Warner e87443b3e4 add 'http://mirror1.malwaredomains.com/files/justdomains' to list of ad-list sources, can be removed if it causes problems
9 years ago
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!
9 years ago
Adam Warner 354a42dd00 close quotes on line 318!!!
9 years ago
Adam Warner 4cedca3427 add in a prompt to give users the option to quit installation or continue
9 years ago
Dan Schaper e99be28a73 Variable missing $
9 years ago
Dan Schaper 32389e4ab8 Terminate string with missing quote
9 years ago
Adam Warner 01d7fc0ac9 Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218
9 years ago
Chad Howell d74c8261aa dnsFile2="/etc/dnsmasq.conf.orig"
9 years ago
Chad Howell ac373545d0 versionCheckDNSmasq() fixups
9 years ago
Chad Howell a21948d2c6 Typo fix
9 years ago
Chad Howell 940480effe Revert "Fix backup to use new 01-pihole.conf location"
9 years ago
Chad Howell 0c444e6f2b Fix backup to use new 01-pihole.conf location
9 years ago
Chad Howell 6cf6e16d22 Add ability to choose upstream DNS servers
9 years ago