Commit Graph

  • 9941651b3c Addresses changes as requested by @jacobsalmela in #282 Promofaux 2016-02-06 13:02:21 +00:00
  • 31fda124f3 Add to contributor info Mcat12 2016-02-05 12:22:23 -05:00
  • b7f6498a5c Create CONTRIBUTING.md Adam Warner 2016-02-05 15:50:15 +00:00
  • 282da1c2b6 Add to contributor info Mcat12 2016-02-05 12:22:23 -05:00
  • 8e6ec6ef0c Create CONTRIBUTING.md Adam Warner 2016-02-05 15:50:15 +00:00
  • 704b3ee673 Merge pull request #286 from pi-hole/docsAPlusSupport Adam Warner 2016-02-04 13:27:12 +00:00
  • c18a1c3eca Add A+ to Raspberry Pi Platforms Dan Schaper 2016-02-04 01:17:00 -08:00
  • 4e1870197e Merge pull request #285 from pi-hole/altInstallDocs Adam Warner 2016-02-03 20:41:45 +00:00
  • 3bf61cce95 Add alternative installation method Dan Schaper 2016-02-03 10:53:23 -08:00
  • 68889b0544 Merge pull request #280 from CDeeRON/patch-1 Jacob Salmela 2016-02-02 11:46:13 -06:00
  • 8a90a47fc2 ATV Hulu domain add CDeeRON 2016-02-02 12:20:30 -05:00
  • c93c4cc5e6 Update basic-install.sh V2.5.1 Adam Warner 2016-02-01 22:28:35 +00:00
  • 06cba7defd Fix script output around new changes Promofaux 2016-02-01 22:25:28 +00:00
  • 8b76bbe51d Merge github.com:pi-hole/pi-hole Promofaux 2016-02-01 22:19:37 +00:00
  • aa1d3a4c2e Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98 Promofaux 2016-02-01 22:19:17 +00:00
  • 66817411f9 Merge pull request #275 from pi-hole/development v2.5 Adam Warner 2016-02-01 09:53:25 +00:00
  • 23c3196935 Merge pull request #277 from pi-hole/cosmeticFix Adam Warner 2016-02-01 07:55:52 +00:00
  • 38e73a188a Fix array selection Dan Schaper 2016-02-01 02:11:55 +00:00
  • 3fdf588cc9 Costmetic fixes, change DynDNS to OpenDNS Dan Schaper 2016-02-01 02:09:11 +00:00
  • 9412fe8a0a Delete version.txt Adam Warner 2016-01-31 21:01:13 +00:00
  • c6450e60e1 Update version.txt Adam Warner 2016-01-31 20:58:11 +00:00
  • 8126e9f4b1 Merge branch 'master' into development Promofaux 2016-01-31 20:48:19 +00:00
  • 70e4104c17 Merge remote-tracking branch 'origin/development' Promofaux 2016-01-31 20:47:10 +00:00
  • 29e0e1760b Fixes #154 #269. No need for PR #214 any more. Promofaux 2016-01-31 20:39:12 +00:00
  • 442b7b4c4d Merge pull request #267 from pi-hole/CBH/UpstreamDNS Dan Schaper 2016-01-30 18:09:00 -08:00
  • 548153fd5e Merge pull request #270 from ChadBHowell/patch-1 Dan Schaper 2016-01-30 17:53:20 -08:00
  • 5060ed8970 Add error checking for grep and correct typos Chad Howell 2016-01-30 20:51:28 -05:00
  • d18e064d21 Remove no longer needed change to config file Dan Schaper 2016-01-30 16:30:38 -08:00
  • 0cfb3c7ab4 Fixed config issue Mcat12 2016-01-30 19:21:31 -05:00
  • 2e0c2f2e77 Merge pull request #268 from pi-hole/licenseUpdate Mcat12 2016-01-30 15:21:53 -05:00
  • 48f9a61ff0 Updated License Mcat12 2016-01-30 15:12:40 -05:00
  • 0042e3ae02 Merge branch 'development' into CBH/UpstreamDNS Mcat12 2016-01-30 13:28:01 -05:00
  • a1204cf246 splunk app Jacob Salmela 2016-01-30 10:20:01 -06:00
  • fc499d9e7c Merge pull request #266 from pi-hole/coverage Mcat12 2016-01-30 12:31:55 -05:00
  • b83704dac2 splunk app Jacob Salmela 2016-01-30 10:20:01 -06:00
  • b93e46de14 Update basic-install.sh Adam Warner 2016-01-30 14:55:02 +00:00
  • 3c49aa9d9d Merge remote-tracking branch 'origin/master' into development Promofaux 2016-01-30 14:38:49 +00:00
  • a448b48eaf Merge remote-tracking branch 'origin/master' Promofaux 2016-01-30 14:38:33 +00:00
  • 3c6551f202 Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting Adam Warner 2016-01-30 14:37:02 +00:00
  • 9e0c7ed29a Merging from CBH bugfix Promofaux 2016-01-30 14:34:12 +00:00
  • 677293f3a9 Merge branch 'CBH/Bugfix/Formatting' Promofaux 2016-01-30 14:29:52 +00:00
  • 34bd7ce3a7 Merge branch 'master' into CBH/Bugfix/Formatting Promofaux 2016-01-30 14:29:01 +00:00
  • 21a07e7419 Merge pull request #263 from pi-hole/newVersioning Adam Warner 2016-01-29 20:47:10 +00:00
  • 6b50ea6504 Merge pull request #249 from pi-hole/OperationBlockListFromGravity Adam Warner 2016-01-29 19:39:11 +00:00
  • 895647b908 Don't copy version to install dir Mcat12 2016-01-29 12:32:58 -05:00
  • 0ece58b9cb Add version Mcat12 2016-01-29 12:23:03 -05:00
  • 49a56cf131 Start on new versioning Mcat12 2016-01-29 08:25:35 -05:00
  • 5fa0d798e2 Update README.md PromoFaux 2016-01-28 10:13:55 +00:00
  • cadc506aa5 Remove extraneous whitespace from basic-install.sh Dan Schaper 2016-01-28 09:25:00 +00:00
  • eee0ccef8c Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2 Chad Howell 2016-01-27 22:44:14 -05:00
  • 088bd632ab Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function Chad Howell 2016-01-27 22:43:43 -05:00
  • 52b5d7143b Merge branch 'development' Promofaux 2016-01-27 23:48:24 +00:00
  • 60bf14d4dd Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix PromoFaux 2016-01-27 23:43:38 +00:00
  • 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 Promofaux 2016-01-27 23:28:36 +00:00
  • 5111880edf remove erroneous -o Promofaux 2016-01-27 22:35:52 +00:00
  • 3d78b44a8e Changes as in #253, but with less commits to keep the repo tidy Promofaux 2016-01-27 22:32:08 +00:00
  • f2d71d41a8 Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity Promofaux 2016-01-27 21:16:35 +00:00
  • b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten Promofaux 2016-01-27 21:14:23 +00:00
  • 701ae06e4a Move copying of adlists.default to gravity.sh Promofaux 2016-01-27 21:14:06 +00:00
  • edd0b809b7 Merge pull request #254 from pi-hole/master PromoFaux 2016-01-27 15:47:54 +00:00
  • 98a0d17431 Update basic-install.sh PromoFaux 2016-01-27 15:28:40 +00:00
  • b1bd56cd51 Update basic-install.sh PromoFaux 2016-01-27 09:47:28 +00:00
  • ae336da7a1 Fix formatting, use consistent style, add comments Chad Howell 2016-01-27 01:11:38 -05:00
  • 4a61b80dd6 Update adlists.default PromoFaux 2016-01-26 23:14:38 +00:00
  • ef99fe2d18 Add line to copy default ad list into /etc/pihole Promofaux 2016-01-26 20:33:49 +00:00
  • 352ebc3193 outsource list of adlists to a file in /etc/pihole/. Promofaux 2016-01-26 20:26:09 +00:00
  • 556799428c Contains default adlists. Promofaux 2016-01-26 20:22:29 +00:00
  • 0b077b9601 Merge pull request #244 from pi-hole/development v2.4 Dan Schaper 2016-01-25 11:04:09 -08:00
  • 80bec9c5cf Delete install PromoFaux 2016-01-25 16:28:26 +00:00
  • c24685c49a Merge pull request #243 from pi-hole/HotFix/InstallScript PromoFaux 2016-01-25 16:22:36 +00:00
  • 2b99fa81f3 Tidy up output lines around new code Adam Warner 2016-01-25 16:08:48 +00:00
  • e87443b3e4 add 'http://mirror1.malwaredomains.com/files/justdomains' to list of ad-list sources, can be removed if it causes problems Adam Warner 2016-01-25 15:53:49 +00:00
  • 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! Adam Warner 2016-01-25 15:52:22 +00:00
  • 354a42dd00 close quotes on line 318!!! Adam Warner 2016-01-25 12:49:04 +00:00
  • 4cedca3427 add in a prompt to give users the option to quit installation or continue Adam Warner 2016-01-25 12:47:03 +00:00
  • e99be28a73 Variable missing $ Dan Schaper 2016-01-25 02:31:03 -08:00
  • 32389e4ab8 Terminate string with missing quote Dan Schaper 2016-01-25 02:27:44 -08:00
  • 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 Adam Warner 2016-01-25 10:07:12 +00:00
  • d74c8261aa dnsFile2="/etc/dnsmasq.conf.orig" Chad Howell 2016-01-25 01:38:41 -05:00
  • ac373545d0 versionCheckDNSmasq() fixups Chad Howell 2016-01-25 01:27:10 -05:00
  • a21948d2c6 Typo fix Chad Howell 2016-01-25 01:09:45 -05:00
  • 940480effe Revert "Fix backup to use new 01-pihole.conf location" Chad Howell 2016-01-25 00:57:36 -05:00
  • 29c593b8b0 Add user pihole if user does not exsist Chad Howell 2016-01-25 00:28:53 -05:00
  • 0c444e6f2b Fix backup to use new 01-pihole.conf location Chad Howell 2016-01-25 00:12:51 -05:00
  • 6cf6e16d22 Add ability to choose upstream DNS servers Chad Howell 2016-01-25 00:11:00 -05:00
  • abef758ff6 Get ready for user selected DNSs Chad Howell 2016-01-25 00:05:17 -05:00
  • e5f9663a0e Move dnsmasq.conf to dnsmasq.d/01-pihole.conf Chad Howell 2016-01-25 00:04:02 -05:00
  • ff5ed561cc Rename dnsmasq.conf to 01-pihole.conf Chad Howell 2016-01-24 23:54:00 -05:00
  • 6b76270889 Remove spinner call when adding URLs of adlist to array.. seems to break it. Promofaux 2016-01-24 22:30:12 +00:00
  • 5d040f45c8 Merge pull request #239 from pi-hole/development PromoFaux 2016-01-24 22:12:04 +00:00
  • cebdcc71a7 Add $SUDO call to spinner() in gravity.sh Promofaux 2016-01-24 21:27:25 +00:00
  • eec14be10d add $SUDO into spinner control. Promofaux 2016-01-24 21:19:23 +00:00
  • c179936b54 add $SUDO Promofaux 2016-01-24 20:49:37 +00:00
  • 649a565801 run apt-get install as sudo when resolving dependencies Promofaux 2016-01-24 20:35:24 +00:00
  • 2d4ebf5eb5 FIX CONFLICTS Promofaux 2016-01-24 20:29:22 +00:00
  • 754beed3a1 Bring up to date with master Promofaux 2016-01-24 20:22:41 +00:00
  • df5059944b Merge branch 'Promofaux-InstallRework' into development Promofaux 2016-01-24 18:51:10 +00:00
  • 9f0927351d Merge from #236 Promofaux 2016-01-24 18:49:25 +00:00
  • 736edf44e4 Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today Promofaux 2016-01-24 17:53:27 +00:00
  • 8ecf8eb76c output to match other scripts Promofaux 2016-01-24 17:18:37 +00:00