Commit graph

  • 8f9ff930b3 Merge pull request #823 from tuplink/EnableOrDisable Adam Warner 2016-10-21 11:02:10 +0100
  • e199f6db87 spelling updates tuplink 2016-10-20 21:15:11 -0400
  • c83dd3ccd7 change spacing tuplink 2016-10-20 18:45:27 -0400
  • 78fbafa1cd test out new status logic tuplink 2016-10-20 18:40:03 -0400
  • b59c19bd77 Merge 12aefc0d8b into 9ab6df0e54 tuplink 2016-10-20 20:19:34 +0000
  • c0012540ed Re-add shebang Promofaux 2016-10-20 21:08:07 +0100
  • 9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond Promofaux 2016-10-20 21:06:28 +0100
  • 12aefc0d8b move 2 quotes tuplink 2016-10-20 14:27:06 -0400
  • 53870ac647 move a quote tuplink 2016-10-20 14:24:50 -0400
  • a12f808516 add a bunch of quotes tuplink 2016-10-20 14:09:11 -0400
  • 7ae700c635 undo old commit tuplink 2016-10-20 13:58:37 -0400
  • a79da9a0ff replace blacklist with blacklistFile tuplink 2016-10-20 13:50:13 -0400
  • ab24e61754 change whitelist to whitelistFile tuplink 2016-10-20 13:45:00 -0400
  • c3f2a9328f add whitelistfile and blacklistfile var tuplink 2016-10-20 13:39:04 -0400
  • f225a5dcd0 move vars to pihole tuplink 2016-10-20 13:31:51 -0400
  • 685b775b68 rework status if statments Tommy Huff 2016-10-20 11:24:34 -0400
  • 9056a5a7b6 fix spelling / replace tabs with spaces in help Tommy Huff 2016-10-20 11:05:49 -0400
  • e1c56bcbfe remove a commit in whitelist Tommy Huff 2016-10-20 10:19:03 -0400
  • 15d68467a1 attempt to fix Tommy Huff 2016-10-20 10:12:02 -0400
  • 3b6ecc573e fix conflict Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable Tommy Huff 2016-10-20 10:09:23 -0400
  • 9427b1e594 Merge branch 'promoTweaksTheSecond' into EnableOrDisable Tommy Huff 2016-10-20 09:55:22 -0400
  • 3ca3eaa62c change restartdnsmasq to restartdns Tommy Huff 2016-10-20 09:40:45 -0400
  • dda448e050 use finction in pihole to restart dnsmasq Tommy Huff 2016-10-20 09:15:03 -0400
  • 60873144ea make last line of script return a new line been bugging me for awhile Tommy Huff 2016-10-20 09:09:35 -0400
  • a9d17c96be include status at end of gravity so if it is disabled you will see it when running Tommy Huff 2016-10-20 09:03:20 -0400
  • aaee895b2b add pihole status web option to return 1 or 0 for easy use with php Tommy Huff 2016-10-20 08:58:36 -0400
  • 7d7e17b351 add toggle to enable or disable pi-hole Tommy Huff 2016-10-20 08:45:20 -0400
  • c71a976e76 kill off an old ugly hack Adam Warner 2016-10-20 13:37:07 +0100
  • 3623183072 Remove reference to non-existent script Adam Warner 2016-10-20 13:29:12 +0100
  • a66a9cafe4 Merge remote-tracking branch 'refs/remotes/pi-hole/master' into pi-hole/promoTweaksTheSecond tuplink 2016-10-20 07:54:45 -0400
  • e6bd979aeb Can't spell Dan Schaper 2016-10-20 04:27:12 -0700
  • 266c160108 Merge pull request #818 from airencracken/development Adam Warner 2016-10-20 12:01:41 +0100
  • b5b6350cc7 Add file change warning to header Dan Schaper 2016-10-20 03:42:25 -0700
  • bbcf4800de use pihole instead of direct path tuplink 2016-10-20 06:30:48 -0400
  • 41056ace02 use pihole instead of direct path tuplink 2016-10-20 06:29:53 -0400
  • 60a80dd678 Merge pull request #819 from pi-hole/adlistremoval Dan Schaper 2016-10-20 02:41:22 -0700
  • 0efda04920 Use heredocs instead of multiple calls to echo Marcus Hildum 2016-10-19 20:46:37 -0700
  • 8819e58882 Remove problem list, sends in Unicode - Not adware Dan Schaper 2016-10-19 20:15:36 -0700
  • 28eeaf201b Standardize function declaration Marcus Hildum 2016-10-19 19:47:45 -0700
  • 74bfcea6a8 add blacklistScript var tuplink 2016-10-19 22:00:03 -0400
  • 16f1d7fad9 Blacklist unwhitelisted tuplink 2016-10-19 21:50:34 -0400
  • 9aa38cf0ae mv patternbuffer instead of cp, then no need to clean up Promofaux 2016-10-19 23:57:43 +0100
  • a7fa7466fb remove no longer needed code Promofaux 2016-10-19 23:54:43 +0100
  • 3f73c61cee cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity Promofaux 2016-10-19 23:52:54 +0100
  • a64f4cd871 whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument Promofaux 2016-10-19 23:17:20 +0100
  • a41eff1276 Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument Promofaux 2016-10-19 23:16:52 +0100
  • b88fe572fe Whitelist/Blacklist domains directly in the Event Horizon. Promofaux 2016-10-19 23:15:05 +0100
  • 59ea687b33 Merge f14c802822 into 16e4f79f09 tuplink 2016-10-19 21:53:21 +0000
  • f14c802822 change writehost to PromoFaux proposed Tommy Huff 2016-10-19 17:52:14 -0400
  • 59ba6f8aec add flag to skip download of lists Promofaux 2016-10-19 22:06:19 +0100
  • 35df1844cb add ip var check Tommy Huff 2016-10-19 15:24:22 -0400
  • acfd56a7b9 Working on ipv6 + ipv4 Tommy Huff 2016-10-19 15:10:33 -0400
  • 25343da6b7 wrong variable name Promofaux 2016-10-19 20:03:29 +0100
  • 60d17b97f5 spacing Promofaux 2016-10-19 19:51:32 +0100
  • 8cb72d87e4 make IPv4/IPv6 checking more robust in gravity Promofaux 2016-10-19 19:50:21 +0100
  • 3d7d7b80f0 Remove CIDR from IPs Tommy Huff 2016-10-19 14:49:29 -0400
  • b2134b8fde remove CIDR from IPs Tommy Huff 2016-10-19 14:49:03 -0400
  • 67f553a7f2 make hosts with ivp4 and 6 Tommy Huff 2016-10-19 14:36:43 -0400
  • e93f8d59d9 remove more old vars Tommy Huff 2016-10-19 13:33:19 -0400
  • 0433838e26 uncomment temp chmod line Tommy Huff 2016-10-19 13:23:25 -0400
  • 495568ea56 remove refrance to old ipv6_addr and test ipv4 and 6 Tommy Huff 2016-10-19 13:21:10 -0400
  • 189d19da37 quote setupVars include / remove if statement for piholeIPv6 Tommy Huff 2016-10-19 12:47:39 -0400
  • 37868a86dd quote -z and -n if vars Tommy Huff 2016-10-19 12:35:45 -0400
  • 7455cac06c assume we need to remove the /CIDR from ipv6 addresses Tommy Huff 2016-10-19 08:28:49 -0400
  • 8872594ab9 create upload dir for lighttpd Jakob Ackermann 2016-10-19 14:27:17 +0200
  • b50584119b Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Jakob Ackermann 2016-10-19 14:24:02 +0200
  • 975f4f2a17 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Jakob Ackermann 2016-10-19 14:15:06 +0200
  • 9617a9eb68 remove debugging on force Tommy Huff 2016-10-19 00:27:11 -0400
  • 2d7e31689c merge with devel Tommy Huff 2016-10-18 23:21:37 -0400
  • 87d3dd2bd5 Merge remote-tracking branch 'origin/development' Tommy Huff 2016-10-18 23:17:58 -0400
  • d4aeef03c7 remove absolute pathnames and store everything in setupvars Tommy Huff 2016-10-18 23:09:55 -0400
  • 16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks Dan Schaper 2016-10-18 17:37:52 -0700
  • 76cae20c33 Merge pull request #803 from pi-hole/attributes Adam Warner 2016-10-18 19:51:44 +0100
  • b66f23cfd0 account for new update script Adam Warner 2016-10-18 14:19:44 +0100
  • 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script Adam Warner 2016-10-18 14:19:25 +0100
  • ff5d5b97c3 stash any changes in local repo Adam Warner 2016-10-18 13:54:09 +0100
  • ce46c4dec4 remove prematurely added code Adam Warner 2016-10-18 12:11:02 +0100
  • 77e8be09a1 handle passing arguments to version script Adam Warner 2016-10-18 12:07:42 +0100
  • 013d77488a complete overhaul of version script. Now with optional arguments! Adam Warner 2016-10-18 12:07:11 +0100
  • 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. Adam Warner 2016-10-18 12:05:48 +0100
  • 97a013b2b7 Add direction to change upstream servers in setupVars.conf Adam Warner 2016-10-18 10:34:05 +0100
  • 77808223dc remove stock comments from 01-pihole.conf and add warning to the top Adam Warner 2016-10-18 10:05:10 +0100
  • fc89851ce9 Merge pull request #805 from pi-hole/development v2.9.4 Jacob Salmela 2016-10-17 22:41:02 -0500
  • c4c6555814 Merge branch 'master' into development Dan Schaper 2016-10-17 19:57:05 -0700
  • df0087fb23 Merge pull request #804 from pi-hole/hotfix/curlRefire Dan Schaper 2016-10-17 19:27:46 -0700
  • ef3c13fe2b Refire with curl Dan Schaper 2016-10-17 19:22:56 -0700
  • 0ad704e532 Update .gitattributes Dan Schaper 2016-10-17 18:31:06 -0700
  • 2220d2dab8 Create .gitattributes Dan Schaper 2016-10-17 18:28:38 -0700
  • 5df1333122 Merge 23d37deb66 into 49f48e2aaa Dan Schaper 2016-10-18 01:07:45 +0000
  • 23d37deb66 Update basic-install.sh Dan Schaper 2016-10-17 18:07:02 -0700
  • 49f48e2aaa wrong word. #admincrimes Promofaux 2016-10-17 22:24:59 +0100
  • dce24df379 Merge pull request #794 from pi-hole/development v2.9.3 Adam Warner 2016-10-17 15:45:21 +0100
  • b59136c262 Merge pull request #800 from bcambl/ifcfg_backup Adam Warner 2016-10-16 22:15:39 +0100
  • fb9664b636 fix typo bcambl 2016-10-16 15:11:47 -0600
  • 5b736ae05e Merge pull request #799 from bcambl/ifcfg_backup Adam Warner 2016-10-16 20:50:54 +0100
  • ee114b3075 use an excluded extension for ifcfg backup bcambl 2016-10-16 13:28:14 -0600
  • 123b16991b Merge pull request #798 from pi-hole/dnsmasqrestartchange Adam Warner 2016-10-16 17:25:30 +0100
  • 5792fc0bef change wording depending on choice Promofaux 2016-10-16 17:23:26 +0100
  • 42c93917ef bug I forgot to fix before piholeUpdate was merged to development Promofaux 2016-10-16 17:19:44 +0100
  • 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq Promofaux 2016-10-16 17:16:59 +0100