Commit graph

  • 9f0927351d Merge from #236 Promofaux 2016-01-24 18:49:25 +0000
  • 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 +0000
  • 8ecf8eb76c output to match other scripts Promofaux 2016-01-24 17:18:37 +0000
  • 3cd1a5b1d5 ... Helps if I add the changes to the repo file, and not the test file on my pi. Promofaux 2016-01-24 16:51:54 +0000
  • 39507b9d0d Added echo ':::' to the top of the file Promofaux 2016-01-24 16:47:38 +0000
  • dfcf9d133e Make output make a bit more sense Promofaux 2016-01-24 16:46:00 +0000
  • 8a74942da7 Cleaned up output before running gravity.sh Promofaux 2016-01-24 16:41:11 +0000
  • 2fe42138c7 removed a space Promofaux 2016-01-24 16:37:15 +0000
  • 1563146918 improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade Promofaux 2016-01-24 16:33:53 +0000
  • cf3aea8075 uncomment the apt-get update/upgrade! Promofaux 2016-01-24 15:27:40 +0000
  • a539dc41f3 Tidy up gravity output to match install script Promofaux 2016-01-24 15:25:24 +0000
  • 9ad54e7c66 Merge fa0939d38a into 3b4bb48a0f Jacob Salmela 2016-01-24 10:54:39 +0000
  • 6cea480210 Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway. Promofaux 2016-01-24 03:31:12 +0000
  • 7b512e1271 Merge e360afadc6 into 3b4bb48a0f Chad Howell 2016-01-24 01:33:36 +0000
  • e360afadc6 Fix backup to use new 01-pihole.conf location Chad Howell 2016-01-23 20:28:35 -0500
  • df24363783 Add ability to choose upstream DNS servers Chad Howell 2016-01-23 20:02:46 -0500
  • 94450d495f Get ready for user selected DNSs Chad Howell 2016-01-23 19:54:07 -0500
  • 59c677387a Move dnsmasq.conf to dnsmasq.d/01-pihole.conf Chad Howell 2016-01-23 19:51:56 -0500
  • 3d5016f1ae Merge ec9999fa6b into 3b4bb48a0f Jacob Salmela 2016-01-24 00:13:51 +0000
  • 39e5e2c70d Merge 4c9205b5b3 into 3b4bb48a0f Chad Howell 2016-01-24 00:13:50 +0000
  • 3b4bb48a0f Merge pull request #234 from ChadBHowell/CBH---Dependencies PromoFaux 2016-01-24 00:13:49 +0000
  • 6f9212f6ea Rename dnsmasq.conf to 01-pihole.conf Chad Howell 2016-01-23 19:05:14 -0500
  • 206717828b Improve spinner function. Promofaux 2016-01-23 22:25:30 +0000
  • 4c9205b5b3 Add user pihole if user does not exsist Chad Howell 2016-01-23 16:48:56 -0500
  • 316d26ede2 Add unzip to the dependencies Chad Howell 2016-01-23 16:29:52 -0500
  • 71fd32b1f4 script to set everything up jacobsalmela 2016-01-23 12:56:27 -0600
  • f2e471707e Pi-hole chrome extension Jacob Salmela 2016-01-23 12:39:09 -0600
  • fcf3b4e4e2 file to set lcd font size jacobsalmela 2016-01-23 11:48:12 -0600
  • fa0939d38a Fix paths to new repo Dan Schaper 2016-01-23 06:41:21 +0000
  • 1226bc9ce8 Merge 8da1d4e853 into 0b03264fb0 Chad Howell 2016-01-23 06:31:42 +0000
  • 1e735c26c4 Repo Change QuickFix Dan Schaper 2016-01-22 20:46:10 -0800
  • 7c5df5dfe3 Merge pull request #229 from PromoFaux/TransferPrep PromoFaux 2016-01-23 01:34:47 +0000
  • 5b62f91bb4 Update README.md PromoFaux 2016-01-23 01:31:33 +0000
  • e8b8fb0835 s Promofaux 2016-01-23 00:23:32 +0000
  • 6663ced38d Initial commit Promofaux 2016-01-23 00:13:16 +0000
  • 0b03264fb0 Merge pull request #225 from jacobsalmela/bugfix/createPiholeDir Dan Schaper 2016-01-22 16:11:15 -0800
  • c99a8a9b15 initial commit Promofaux 2016-01-22 20:30:32 +0000
  • ea0fb15ff2 Move creation of pihole directory out of IPv6 function Dan Schaper 2016-01-22 19:48:55 +0000
  • 05a59b17be Changed URLs in installScripts() to match new organisation links Adam Warner 2016-01-22 16:50:01 +0000
  • 0b59368f1c Update chronometer.sh PromoFaux 2016-01-22 14:38:12 +0000
  • 7142666066 Update chronometer.sh PromoFaux 2016-01-22 14:16:21 +0000
  • 8da1d4e853 Merge pull request #2 from jacobsalmela/development Chad Howell 2016-01-21 20:45:32 -0500
  • 4f82212fae Merge 8b18fdd322 into d1e054d713 Leo 2016-01-21 22:19:09 +0000
  • 8b18fdd322 Update gravity.sh Leo 2016-01-21 17:19:09 -0500
  • 1349f584be Use Sudo Detection from Installer in Gravity.sh Also Leo 2016-01-21 17:14:55 -0500
  • 48db85187e Merge pull request #219 from jacobsalmela/master Dan Schaper 2016-01-21 12:19:12 -0800
  • d1e054d713 Merge pull request #216 from mechaxl/master Dan Schaper 2016-01-21 09:48:44 -0800
  • ce578534fe Fixing minor typos in basic-install.sh Kenneth Koski 2016-01-21 11:29:44 -0600
  • c7c4a5c602 Merge pull request #215 from jacobsalmela/development v2.3 Dan Schaper 2016-01-21 08:42:53 -0800
  • 332baed4bb fixes #154 jacobsalmela 2016-01-21 06:51:16 -0600
  • ec9999fa6b installs mysql components jacobsalmela 2016-01-20 19:46:44 -0600
  • 739027a27d scripts to long-term stats jacobsalmela 2016-01-20 19:40:12 -0600
  • 3f40a95929 Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled Promofaux 2016-01-20 23:34:18 +0000
  • 5c25c42da8 Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html Promofaux 2016-01-20 22:14:17 +0000
  • 96011bc2ae make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder. Promofaux 2016-01-20 22:02:54 +0000
  • 4f59577fd1 Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root Promofaux 2016-01-20 21:20:52 +0000
  • ebf7e074dd Merge d8d69f5a4d into 494fcd60ab Chad Howell 2016-01-20 05:37:48 +0000
  • 494fcd60ab Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development Dan Schaper 2016-01-20 05:25:49 +0000
  • 544919175c Added back in debugging response header Mcat12 2016-01-17 20:36:59 -0500
  • ede8f4714f Removed extra http redirect Mcat12 2016-01-17 19:52:59 -0500
  • 500f89bd84 Allow user to be chosen during install Chad Howell 2016-01-19 21:43:17 -0500
  • bd4c9f4ffb Merge pull request #1 from jacobsalmela/development Chad Howell 2016-01-19 21:14:46 -0500
  • f85bc357be Merge 1c87d9a630 into b512496818 Jacob Salmela 2016-01-20 01:43:45 +0000
  • 837103e025 Merge bb79d5332c into b512496818 Mcat12 2016-01-20 01:42:43 +0000
  • b512496818 Merge pull request #207 from jacobsalmela/bugfix/Chronometer Dan Schaper 2016-01-19 17:42:41 -0800
  • 8094f7234c Merge pull request #202 from PromoFaux/FixChronometer Dan Schaper 2016-01-19 17:39:46 -0800
  • 7dfd9f0378 Merge pull request #205 from PromoFaux/InstallScript Dan Schaper 2016-01-19 16:21:49 -0800
  • bc51f88805 Check if any list.* files exist from previous installation, if they do delete them. Promofaux 2016-01-19 22:52:29 +0000
  • c6737d5745 Merge d8d69f5a4d into 03277899ca Chad Howell 2016-01-19 22:47:44 +0000
  • d8d69f5a4d Correct typo in /etc/dnsmasq.d/ Chad Howell 2016-01-19 17:47:44 -0500
  • e04e2537a8 Merge pull request #203 from jacobsalmela/master Dan Schaper 2016-01-19 13:20:21 -0800
  • 4067595e23 Merge af982a02af into 03277899ca Adam Warner 2016-01-19 21:15:04 +0000
  • af982a02af Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains. Promofaux 2016-01-19 21:14:01 +0000
  • 03277899ca Merge pull request #199 from PromoFaux/master Jacob Salmela 2016-01-19 12:16:41 -0600
  • 6756843be7 Merge pull request #2 from PromoFaux/PromoFaux-patch-1 Adam Warner 2016-01-19 17:14:10 +0000
  • ac35417ab0 Update README.md Adam Warner 2016-01-19 17:13:48 +0000
  • 092c951078 Merge pull request #1 from jacobsalmela/master Adam Warner 2016-01-19 16:26:09 +0000
  • c6ce18527f Add ability to choose upstream DNS servers Chad Howell 2016-01-19 01:54:20 -0500
  • 976940f883 Get ready for user selected DNSs ChadBHowell 2016-01-18 23:32:33 -0500
  • 4e81a0363a Don't back original dnsmasq.conf ChadBHowell 2016-01-18 23:28:00 -0500
  • 1c87d9a630 still don't git git jacobsalmela 2016-01-18 22:25:46 -0600
  • 94835bcc97 Move dnsmasq.conf to dnsmasq.d/01-pihole.conf ChadBHowell 2016-01-18 23:19:49 -0500
  • d1452b6da7 Add unzip to installDependencies() ChadBHowell 2016-01-18 23:08:56 -0500
  • e5c682069b Rename dnsmasq.conf to 01-pihole.conf ChadBHowell 2016-01-18 23:04:13 -0500
  • 14fef45e47 cancel from interface screen jacobsalmela 2016-01-18 21:53:09 -0600
  • 59d8277b7b fixes #154 jacobsalmela 2016-01-18 21:27:40 -0600
  • 928072eecc Merge branch 'master' into installation jacobsalmela 2016-01-18 21:26:47 -0600
  • 9ba38e668a Merge pull request #193 from PromoFaux/Chronometer Jacob Salmela 2016-01-18 17:36:33 -0600
  • f665899116 Update chronometer.sh Adam Warner 2016-01-18 23:35:21 +0000
  • de464e17cc Update chronometer.sh Adam Warner 2016-01-18 22:24:02 +0000
  • 0eed56380d Update chronometer.sh Adam Warner 2016-01-18 22:15:39 +0000
  • 487c26db44 Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard. Promofaux 2016-01-18 22:03:53 +0000
  • 0a57b43f09 C.H.I.P. ad blocking project Jacob Salmela 2016-01-17 20:55:02 -0600
  • 48f8d7ed0f pi-hole mentioned in a podcast Jacob Salmela 2016-01-17 20:34:48 -0600
  • bb79d5332c Added back in debugging response header Mcat12 2016-01-17 20:36:59 -0500
  • 6d7cbe5b35 Added text to ad blocking page Mcat12 2016-01-17 19:53:13 -0500
  • de2baf05fa Removed extra http redirect Mcat12 2016-01-17 19:52:59 -0500
  • d77399727c Merge pull request #189 from jacobsalmela/whitelist Jacob Salmela 2016-01-17 18:34:02 -0600
  • 56ea07c1ec Merge pull request #187 from PromoFaux/whitelist Jacob Salmela 2016-01-17 08:56:09 -0600
  • 6540457d1f Merge 414ef54cfe into 0a0f00da3b PromoFaux 2016-01-17 14:12:15 +0000