Commit Graph

  • 6fc4fadf93 Merge b4b7ae7405 into 0a0f00da3b #185 PromoFaux 2016-01-17 14:03:18 +0000
  • b4b7ae7405 Saved in Unix mode as oppsed to DOS.. #185 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 #180 Jacob Salmela 2016-01-16 11:58:08 -0600
  • f9a2ca5c32 Tidy up help text on both scripts. Add quiet help. #174 Promofaux 2016-01-16 00:47:45 +0000
  • 665dfdfe8e Install Figlet Fonts with Toilet #176 Leo 2016-01-15 18:50:32 -0500
  • 0f05ab7ccc Merge github.com:Promofaux/pi-hole #184 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 #173 PromoFaux 2016-01-15 15:56:09 +0000
  • 2284a27814 Consumes blacklist.sh now, too. #173 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 #168 PromoFaux 2016-01-14 23:19:28 +0000
  • 750e4b53d0 *note to self : pay more attention* #168 Promofaux 2016-01-14 23:19:17 +0000
  • 9ff1129510 Minibian Pi-hole Jacob Salmela 2016-01-14 17:11:16 -0600
  • a2d2c53024 *cough* Promofaux 2016-01-14 23:07:52 +0000
  • f52358384e update install script to include blacklist.sh Promofaux 2016-01-14 22:47:40 +0000
  • 63ceba2e7a fixed a goof with adding blacklisted domains Promofaux 2016-01-14 22:46:43 +0000
  • 1ce5add332 much like the whitelist script as requested in #139 Promofaux 2016-01-14 22:46:21 +0000
  • 138dcde7b7 Rewrite of whitelist.sh to take into account new whitelisting method. Checks existing whitelist.txt for domain passed in argument, if it doesn't exist it will run gravity.sh to reload the hosts file. Promofaux 2016-01-14 22:23:15 +0000
  • bf58ce8db2 fixed referal to latentwhitelist.txt and replaced with variable. Don't judge me! Promofaux 2016-01-14 20:50:25 +0000
  • 4ac2f96514 Tidyed up fixes to gravity.sh. Promofaux 2016-01-14 20:26:06 +0000
  • f5b5e12bc2 Testing fix to gravity.sh Adam Warner 2016-01-14 17:32:38 +0000
  • f964aff9b0 Changed dnsmasq restart handling to be the same as gravity.sh Adam Warner 2016-01-14 11:27:55 +0000
  • 733615ddfd Merge e7926148ed into 4b1dd8a2a5 #164 Dan Schaper 2016-01-13 18:35:13 +0000
  • e7926148ed Use pre-defined variables for desired interface #164 Dan Schaper 2016-01-13 10:33:12 -0800
  • f9717bcff6 Merge pull request #11 from jacobsalmela/master Dan Schaper 2016-01-13 10:31:57 -0800
  • 4b1dd8a2a5 fixes #158 Jacob Salmela 2016-01-12 17:44:08 -0600
  • 57f939da49 Merge a6edbf091d into b5bdfe27be #153 Josh Kastang 2016-01-11 23:39:43 +0000
  • b5bdfe27be Merge pull request #155 from JoshKastang/webinterface-update Jacob Salmela 2016-01-11 17:39:42 -0600
  • c00d1e73ad Merge 2cdb873f14 into 0ef0b0b661 #157 Mike Tedesco 2016-01-10 21:52:21 +0000
  • 2cdb873f14 A better back up for /etc/dnsmasq.d/ #157 Mike Tedesco 2016-01-10 16:51:42 -0500
  • 518635dbe2 Merge e6a7cb8775 into 0ef0b0b661 #156 Mike Tedesco 2016-01-10 21:44:28 +0000
  • e6a7cb8775 adList.conf is not in use #156 Mike Tedesco 2016-01-10 16:44:20 -0500
  • 759fc896c2 Removing adList.conf from conditional check in backupLegacyPihole. Looks like adList.conf was created by gravity-adv.sh which seem to be no longer in use. Mike Tedesco 2016-01-10 16:39:37 -0500
  • 0ef0b0b661 LCD real-time stats Jacob Salmela 2016-01-10 14:09:40 -0600
  • 802638ce8b replaces the non-repository managed web interface for pihole and keeps it updated #155 Josh Kastang 2016-01-10 19:08:29 +0000
  • a6edbf091d attempt to self-elevate to root user to execute script #153 Josh Kastang 2016-01-10 16:48:48 +0000
  • cfd6e0d65d more coverage and an API Jacob Salmela 2016-01-10 10:40:58 -0600
  • 362fe627c6 spelling mistake, added default lighttpd file Josh Kastang 2016-01-10 15:23:03 +0000
  • cb40158910 implemented a more graceful removal of /var/www/html - it is dangerous to assume /var/www/html is not being used for anything else when uninstalling pihole Josh Kastang 2016-01-10 09:31:46 -0500
  • 8b51e44074 /etc/crontab should never be modified. instead use /etc/cron.d to install cron tasks Josh Kastang 2016-01-10 09:29:38 -0500
  • e9a3ea6508 Added root check and removed sudo statements Josh Kastang 2016-01-10 09:01:41 -0500
  • 93664aeb4e cleaning up the readme Jacob Salmela 2016-01-04 20:32:46 -0600
  • 020282f9df Merge remote-tracking branch 'refs/remotes/origin/master' into patch-1 #67 Mel 2016-01-02 22:03:15 -0600
  • 7d1e54f72b Merge remote-tracking branch 'refs/remotes/jacobsalmela/master' into patch-1 Mel 2016-01-02 21:21:48 -0600
  • 6f9d2d0567 fixes #145 v2.2 Jacob Salmela 2016-01-02 17:20:33 -0600
  • d2b6947886 Merge pull request #146 from iblamefish/multiple-interfaces Jacob Salmela 2016-01-02 17:17:58 -0600
  • bc3224e0b9 installer - only select first (probably default) interface in list instead of all #146 Clinton 2016-01-02 22:10:26 +0000
  • ba75c4c62c Merge pull request #144 from jacobsalmela/ipv6 Jacob Salmela 2016-01-01 18:44:07 -0600
  • 3fc1817e7a Merge branch 'master' into ipv6 #144 Jacob Salmela 2016-01-01 18:34:33 -0600
  • ab1352b48e Merge pull request #143 from iblamefish/master Jacob Salmela 2016-01-01 18:16:35 -0600
  • 89b88a2d5d fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running #143 Clinton 2016-01-02 00:10:12 +0000
  • d37db4304c A few small display changes Salmela 2016-01-01 10:59:30 -0600
  • a6b18feed9 Merge pull request #141 from iblamefish/ipv6 Jacob Salmela 2016-01-01 09:14:43 -0600
  • 987e4e02a9 Fix bug in gravity.sh where IPv6 list was not always populated #141 Clinton 2016-01-01 14:11:46 +0000
  • d646612a25 Block ads over IPv6 Salmela 2015-12-31 20:26:05 -0600
  • 8ffa5e9357 adding unRaid-hole fork Jacob Salmela 2015-12-30 13:34:45 -0600
  • d92b3fda91 Merge pull request #137 from iblamefish/patch-1 Jacob Salmela 2015-12-28 10:44:50 -0600
  • b757e7a769 Fix typo in installer #137 Clinton Montague 2015-12-28 12:29:54 +0000
  • 26dcbfc1f9 hide minor error Jacob Salmela 2015-12-27 12:25:35 -0600
  • 94f7363b8f Merge pull request #136 from klaas01/patch-2 Jacob Salmela 2015-12-27 12:07:16 -0600
  • a6313c9e9e Update gravity.sh #136 klaas01 2015-12-26 14:37:51 -0400
  • de7a79f5ac Merge 737fe9a5f1 into 3cdce17d28 #135 klaas01 2015-12-26 18:03:43 +0000
  • 737fe9a5f1 Update gravity.sh #135 klaas01 2015-12-26 14:03:26 -0400
  • 3cdce17d28 adding more coverage Jacob Salmela 2015-12-25 21:14:19 -0600
  • 005a937f0f Merge pull request #10 from jacobsalmela/master Dan Schaper 2015-12-17 18:48:54 -0800
  • 184d1bd046 fixes #126 Jacob Salmela 2015-12-16 11:23:44 -0600
  • c88982d0d5 chmod doesn't apply at initial install Jacob Salmela 2015-12-09 15:52:53 -0600
  • 57282cfe16 ugly hack to whitelist from the Web interface Jacob Salmela 2015-12-09 15:16:34 -0600
  • d18ab8032a Merge pull request #9 from jacobsalmela/master Dan Schaper 2015-12-08 22:44:39 -0800
  • 263d9a222a Merge pull request #120 from dschaper/documenting Jacob Salmela 2015-12-08 17:46:56 -0600
  • 73bbfc27d0 Remove extra debian doc file #120 Dan Schaper 2015-12-08 15:43:40 -0800
  • 4027139d9c More merge conflict resolution Dan Schaper 2015-12-06 20:24:58 -0800
  • d215fa9ade Resolve merge confict Dan Schaper 2015-12-06 20:22:34 -0800
  • b261e046bb Merge pull request #8 from jacobsalmela/master Dan Schaper 2015-12-06 14:44:55 -0800
  • 4bca6fdfc4 Merge pull request #124 from dschaper/master Jacob Salmela 2015-12-06 16:41:46 -0600
  • 9c1eca23ae Fix merge conflicts #124 Dan Schaper 2015-12-06 14:39:43 -0800
  • 66953319c4 Merge branch 'development' of github.com:dschaper/pi-hole into development Dan Schaper 2015-12-06 14:37:40 -0800
  • dfc317124c Merge pull request #6 from jacobsalmela/development Dan Schaper 2015-12-06 14:36:55 -0800
  • debb5aeed6 Merge pull request #5 from jacobsalmela/master Dan Schaper 2015-12-06 14:36:26 -0800
  • f724a3a61a Merge pull request #122 from dschaper/bug/interfaceCheck #123 Jacob Salmela 2015-12-06 16:32:44 -0600
  • f5e573371c Merge pull request #121 from dschaper/development Jacob Salmela 2015-12-06 16:31:11 -0600
  • 86192a6950 Merge pull request #117 from dschaper/master Jacob Salmela 2015-12-06 16:18:12 -0600