1
0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-05 05:30:55 +00:00

Commit Graph

  • 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
  • 414ef54cfe Switched CRLF to LF (DOS to UNIX) Promofaux 2016-01-17 14:09:06 +0000
  • 6fc4fadf93 Merge b4b7ae7405 into 0a0f00da3b PromoFaux 2016-01-17 14:03:18 +0000
  • b4b7ae7405 Saved in Unix mode as oppsed to DOS.. Promofaux 2016-01-17 13:56:18 +0000
  • e4f4488c9b Merge from upstream Promofaux 2016-01-17 13:50:28 +0000
  • 0a0f00da3b fixes #169 jacobsalmela 2016-01-16 14:10:03 -0600
  • bee109c784 better uninstall jacobsalmela 2016-01-16 13:56:08 -0600
  • 5d608a2db5 leave system cron alone jacobsalmela 2016-01-16 13:48:29 -0600
  • 7c6ef0cfd0 privileged install jacobsalmela 2016-01-16 13:40:09 -0600
  • 0cf859344a Merge pull request #176 from xd1936/patch-1 Jacob Salmela 2016-01-16 13:19:15 -0600
  • 6125b2520b install git for updateDashboard.sh jacobsalmela 2016-01-16 13:15:44 -0600
  • bd5ed2bcf0 move webinterface.sh into scripts folder jacobsalmela 2016-01-16 13:12:55 -0600
  • a2a58f7b39 Merge pull request #180 from jacobsalmela/whitelist Jacob Salmela 2016-01-16 12:24:43 -0600
  • 87980c6df8 Merge pull request #174 from PromoFaux/whitelist Jacob Salmela 2016-01-16 11:58:08 -0600
  • f9a2ca5c32 Tidy up help text on both scripts. Add quiet help. Promofaux 2016-01-16 00:47:45 +0000
  • 665dfdfe8e Install Figlet Fonts with Toilet Leo 2016-01-15 18:50:32 -0500
  • 0f05ab7ccc Merge github.com:Promofaux/pi-hole Promofaux 2016-01-15 21:44:40 +0000
  • 2b0bee085b Incorrect reference to whitelist in the blacklist.sh comments :) Adam Warner 2016-01-15 18:57:20 +0000
  • ddfefb291d Merge branch 'Whitelistingchanges' into whitelist Adam Warner 2016-01-15 18:45:59 +0000
  • 5d842a7533 Merging Adam Warner 2016-01-15 18:45:12 +0000
  • c96c25cada Merge 2284a27814 into 9ff1129510 PromoFaux 2016-01-15 15:56:09 +0000
  • 2284a27814 Consumes blacklist.sh now, too. Adam Warner 2016-01-15 15:54:11 +0000
  • f68cf10efa Tidied up a couple of things Adam Warner 2016-01-15 15:54:00 +0000
  • 89e3c25a90 Behaves like whitelist, but on the blacklist Adam Warner 2016-01-15 15:53:40 +0000
  • 6b1f14647c add reference to blacklist.sh Adam Warner 2016-01-15 15:52:27 +0000
  • 14ee4850af Placeholder for blacklist script Adam Warner 2016-01-15 14:50:13 +0000
  • cc62d984d2 Changed whitelist function to outsource to whitelist.sh Adam Warner 2016-01-15 14:49:16 +0000
  • 534dbc9b6e added a quiet option for when the script is called by gravity. Less output = less confusion! Adam Warner 2016-01-15 14:48:07 +0000
  • 8ad116fe7b Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit Adam Warner 2016-01-15 14:17:55 +0000
  • ca5e34a9a9 Merge branch 'master' into whitelist jacobsalmela 2016-01-14 18:12:45 -0600
  • 4926db903c Merge 750e4b53d0 into 9ff1129510 PromoFaux 2016-01-14 23:19:28 +0000
  • 750e4b53d0 *note to self : pay more attention* Promofaux 2016-01-14 23:19:17 +0000