Commit graph

  • 70e4104c17 Merge remote-tracking branch 'origin/development' Promofaux 2016-01-31 20:47:10 +0000
  • 29e0e1760b Fixes #154 #269. No need for PR #214 any more. Promofaux 2016-01-31 20:39:12 +0000
  • 976a006440 Merge fa21951ab7 into dda66a70bd Igor Rzegocki 2016-01-31 10:30:33 +0000
  • fa21951ab7 Fixed Pi-Hole header for nginx, and default page display Igor Rzegocki 2016-01-31 11:16:52 +0100
  • 12fc7de300 Fixed Pi-Hole header for nginx, and default page display Igor Rzegocki 2016-01-31 11:16:52 +0100
  • 442b7b4c4d Merge pull request #267 from pi-hole/CBH/UpstreamDNS Dan Schaper 2016-01-30 18:09:00 -0800
  • 548153fd5e Merge pull request #270 from ChadBHowell/patch-1 Dan Schaper 2016-01-30 17:53:20 -0800
  • 5060ed8970 Add error checking for grep and correct typos Chad Howell 2016-01-30 20:51:28 -0500
  • d18e064d21 Remove no longer needed change to config file Dan Schaper 2016-01-30 16:30:38 -0800
  • 0cfb3c7ab4 Fixed config issue Mcat12 2016-01-30 19:21:31 -0500
  • 2e0c2f2e77 Merge pull request #268 from pi-hole/licenseUpdate Mcat12 2016-01-30 15:21:53 -0500
  • 48f9a61ff0 Updated License Mcat12 2016-01-30 15:12:40 -0500
  • 0042e3ae02 Merge branch 'development' into CBH/UpstreamDNS Mcat12 2016-01-30 13:28:01 -0500
  • a1204cf246 splunk app Jacob Salmela 2016-01-30 10:20:01 -0600
  • fc499d9e7c Merge pull request #266 from pi-hole/coverage Mcat12 2016-01-30 12:31:55 -0500
  • b83704dac2 splunk app Jacob Salmela 2016-01-30 10:20:01 -0600
  • b93e46de14 Update basic-install.sh Adam Warner 2016-01-30 14:55:02 +0000
  • 3c49aa9d9d Merge remote-tracking branch 'origin/master' into development Promofaux 2016-01-30 14:38:49 +0000
  • a448b48eaf Merge remote-tracking branch 'origin/master' Promofaux 2016-01-30 14:38:33 +0000
  • 3c6551f202 Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting Adam Warner 2016-01-30 14:37:02 +0000
  • 9e0c7ed29a Merging from CBH bugfix Promofaux 2016-01-30 14:34:12 +0000
  • 677293f3a9 Merge branch 'CBH/Bugfix/Formatting' Promofaux 2016-01-30 14:29:52 +0000
  • 34bd7ce3a7 Merge branch 'master' into CBH/Bugfix/Formatting Promofaux 2016-01-30 14:29:01 +0000
  • 46eee2e9fc Merge branch 'development' of https://github.com/gh0stshell/pi-hole into gh0stshell/Bugfix/LogFlush Dan Schaper 2016-01-30 07:13:07 +0000
  • db6d334308 Merge 3ec23a66a3 into 21a07e7419 gh0stshell 2016-01-29 22:12:17 +0000
  • 21a07e7419 Merge pull request #263 from pi-hole/newVersioning Adam Warner 2016-01-29 20:47:10 +0000
  • 6b50ea6504 Merge pull request #249 from pi-hole/OperationBlockListFromGravity Adam Warner 2016-01-29 19:39:11 +0000
  • 895647b908 Don't copy version to install dir Mcat12 2016-01-29 12:32:58 -0500
  • 0ece58b9cb Add version Mcat12 2016-01-29 12:23:03 -0500
  • 49a56cf131 Start on new versioning Mcat12 2016-01-29 08:25:35 -0500
  • dda66a70bd Merge branch 'nginx-support' of https://github.com/ajgon/pi-hole into Feature/ajgon-nginx Dan Schaper 2016-01-28 23:56:23 +0000
  • 1eefa9771c Merge 34ff9b309a into 60bf14d4dd Igor Rzegocki 2016-01-28 19:56:42 +0000
  • 34ff9b309a Added nginx as an optional server. Igor Rzegocki 2016-01-28 20:42:16 +0100
  • a46fa6433b Merge 2299600743 into 5fa0d798e2 Igor Rzegocki 2016-01-28 19:45:51 +0000
  • 2299600743 Added nginx as an optional server. Igor Rzegocki 2016-01-28 20:42:16 +0100
  • 5fa0d798e2 Update README.md PromoFaux 2016-01-28 10:13:55 +0000
  • cadc506aa5 Remove extraneous whitespace from basic-install.sh Dan Schaper 2016-01-28 09:25:00 +0000
  • 3ec23a66a3 Update chronometer.sh gh0stshell 2016-01-27 21:41:10 -0700
  • eee0ccef8c Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2 Chad Howell 2016-01-27 22:44:14 -0500
  • 029192ae49 Merge 088bd632ab into 60bf14d4dd Chad Howell 2016-01-28 03:43:57 +0000
  • 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 -0500
  • 0eb456a9c1 Merge 00b28836f4 into 60bf14d4dd Chad Howell 2016-01-28 03:34:50 +0000
  • 00b28836f4 Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Upsteam-DNS-enhancement-v2 Chad Howell 2016-01-27 22:34:32 -0500
  • 60aed85933 Update piholeLogFlush.sh gh0stshell 2016-01-27 20:13:14 -0700
  • 52b5d7143b Merge branch 'development' Promofaux 2016-01-27 23:48:24 +0000
  • 60bf14d4dd Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix PromoFaux 2016-01-27 23:43:38 +0000
  • 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 +0000
  • 5111880edf remove erroneous -o Promofaux 2016-01-27 22:35:52 +0000
  • 3d78b44a8e Changes as in #253, but with less commits to keep the repo tidy Promofaux 2016-01-27 22:32:08 +0000
  • 03ba960b7d Merge dbf1308c67 into edd0b809b7 PromoFaux 2016-01-27 22:25:09 +0000
  • dbf1308c67 Change exit to exit 1 Promofaux 2016-01-27 22:24:47 +0000
  • cc0997f110 Curl does not wait for user input. Force user to quit installation if there are packages that need to be upgraded. Promofaux 2016-01-27 22:08:43 +0000
  • ea7592a8cc Trying another thing Promofaux 2016-01-27 21:59:45 +0000
  • c16efd4491 Trying something Promofaux 2016-01-27 21:51:38 +0000
  • f2d71d41a8 Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity Promofaux 2016-01-27 21:16:35 +0000
  • b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten Promofaux 2016-01-27 21:14:23 +0000
  • 701ae06e4a Move copying of adlists.default to gravity.sh Promofaux 2016-01-27 21:14:06 +0000
  • b8f48d1bce Add in apt-get update if it has not been run today. Otherwise, check number of upgrades availible, advise user there are updates, and at their choice, either continue or cancel the installation Promofaux 2016-01-27 21:09:34 +0000
  • a05b6a4e12 Move mkdir /etc/pihole to the very top Promofaux 2016-01-27 20:16:08 +0000
  • edd0b809b7 Merge pull request #254 from pi-hole/master PromoFaux 2016-01-27 15:47:54 +0000
  • 98a0d17431 Update basic-install.sh PromoFaux 2016-01-27 15:28:40 +0000
  • f752057fb6 Update basic-install.sh PromoFaux 2016-01-27 10:12:28 +0000
  • b1bd56cd51 Update basic-install.sh PromoFaux 2016-01-27 09:47:28 +0000
  • ae336da7a1 Fix formatting, use consistent style, add comments Chad Howell 2016-01-27 01:11:38 -0500
  • 4a61b80dd6 Update adlists.default PromoFaux 2016-01-26 23:14:38 +0000
  • ef99fe2d18 Add line to copy default ad list into /etc/pihole Promofaux 2016-01-26 20:33:49 +0000
  • 352ebc3193 outsource list of adlists to a file in /etc/pihole/. Promofaux 2016-01-26 20:26:09 +0000
  • 556799428c Contains default adlists. Promofaux 2016-01-26 20:22:29 +0000
  • 0b077b9601 Merge pull request #244 from pi-hole/development v2.4 Dan Schaper 2016-01-25 11:04:09 -0800
  • 80bec9c5cf Delete install PromoFaux 2016-01-25 16:28:26 +0000
  • c24685c49a Merge pull request #243 from pi-hole/HotFix/InstallScript PromoFaux 2016-01-25 16:22:36 +0000
  • 2b99fa81f3 Tidy up output lines around new code Adam Warner 2016-01-25 16:08:48 +0000
  • 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 +0000
  • 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 +0000
  • 354a42dd00 close quotes on line 318!!! Adam Warner 2016-01-25 12:49:04 +0000
  • 4cedca3427 add in a prompt to give users the option to quit installation or continue Adam Warner 2016-01-25 12:47:03 +0000
  • e99be28a73 Variable missing $ Dan Schaper 2016-01-25 02:31:03 -0800
  • 32389e4ab8 Terminate string with missing quote Dan Schaper 2016-01-25 02:27:44 -0800
  • 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 +0000
  • d74c8261aa dnsFile2="/etc/dnsmasq.conf.orig" Chad Howell 2016-01-25 01:38:41 -0500
  • ac373545d0 versionCheckDNSmasq() fixups Chad Howell 2016-01-25 01:27:10 -0500
  • a21948d2c6 Typo fix Chad Howell 2016-01-25 01:09:45 -0500
  • 940480effe Revert "Fix backup to use new 01-pihole.conf location" Chad Howell 2016-01-25 00:57:36 -0500
  • 29c593b8b0 Add user pihole if user does not exsist Chad Howell 2016-01-25 00:28:53 -0500
  • 0c444e6f2b Fix backup to use new 01-pihole.conf location Chad Howell 2016-01-25 00:12:51 -0500
  • 6cf6e16d22 Add ability to choose upstream DNS servers Chad Howell 2016-01-25 00:11:00 -0500
  • abef758ff6 Get ready for user selected DNSs Chad Howell 2016-01-25 00:05:17 -0500
  • e5f9663a0e Move dnsmasq.conf to dnsmasq.d/01-pihole.conf Chad Howell 2016-01-25 00:04:02 -0500
  • ff5ed561cc Rename dnsmasq.conf to 01-pihole.conf Chad Howell 2016-01-24 23:54:00 -0500
  • 9dd1f691b1 Merge remote-tracking branch 'refs/remotes/origin/development' into CBH---User-pihole Chad Howell 2016-01-24 18:26:06 -0500
  • ea203fca14 Merge remote-tracking branch 'refs/remotes/pi-hole/master' into development Chad Howell 2016-01-24 18:21:54 -0500
  • 6b76270889 Remove spinner call when adding URLs of adlist to array.. seems to break it. Promofaux 2016-01-24 22:30:12 +0000
  • 5d040f45c8 Merge pull request #239 from pi-hole/development PromoFaux 2016-01-24 22:12:04 +0000
  • cebdcc71a7 Add $SUDO call to spinner() in gravity.sh Promofaux 2016-01-24 21:27:25 +0000
  • eec14be10d add $SUDO into spinner control. Promofaux 2016-01-24 21:19:23 +0000
  • c179936b54 add $SUDO Promofaux 2016-01-24 20:49:37 +0000
  • 649a565801 run apt-get install as sudo when resolving dependencies Promofaux 2016-01-24 20:35:24 +0000
  • 2d4ebf5eb5 FIX CONFLICTS Promofaux 2016-01-24 20:29:22 +0000
  • 754beed3a1 Bring up to date with master Promofaux 2016-01-24 20:22:41 +0000
  • df5059944b Merge branch 'Promofaux-InstallRework' into development Promofaux 2016-01-24 18:51:10 +0000