tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,243 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

1243 Commits

Author SHA1 Message Date
Tommy Huff 3b6ecc573e fix conflict 
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
 2016-10-20 10:09:23 -04:00
Tommy Huff 9427b1e594 Merge branch 'promoTweaksTheSecond' into EnableOrDisable 2016-10-20 09:55:22 -04:00
Tommy Huff 3ca3eaa62c change restartdnsmasq to restartdns 2016-10-20 09:40:45 -04:00
Tommy Huff dda448e050 use finction in pihole to restart dnsmasq 2016-10-20 09:15:03 -04:00
Tommy Huff 60873144ea make last line of script return a new line been bugging me for awhile 2016-10-20 09:09:35 -04:00
Tommy Huff a9d17c96be include status at end of gravity so if it is disabled you will see it when running 2016-10-20 09:03:20 -04:00
Tommy Huff aaee895b2b add pihole status web option to return 1 or 0 for easy use with php 2016-10-20 08:58:36 -04:00
Tommy Huff 7d7e17b351 add toggle to enable or disable pi-hole 2016-10-20 08:45:20 -04:00
Adam Warner c71a976e76 kill off an old ugly hack 2016-10-20 13:37:07 +01:00
Adam Warner 3623183072 Remove reference to non-existent script 2016-10-20 13:29:12 +01:00
tuplink bbcf4800de use pihole instead of direct path 2016-10-20 06:30:48 -04:00
tuplink 41056ace02 use pihole instead of direct path 2016-10-20 06:29:53 -04:00
tuplink 74bfcea6a8 add blacklistScript var 2016-10-19 22:00:03 -04:00
tuplink 16f1d7fad9 Blacklist unwhitelisted 2016-10-19 21:50:34 -04:00
Promofaux 9aa38cf0ae mv patternbuffer instead of cp, then no need to clean up 2016-10-19 23:57:43 +01:00
Promofaux a7fa7466fb remove no longer needed code 2016-10-19 23:54:43 +01:00
Promofaux 3f73c61cee cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity 2016-10-19 23:52:54 +01:00
Promofaux a64f4cd871 whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument 2016-10-19 23:17:20 +01:00
Promofaux a41eff1276 Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument 2016-10-19 23:16:52 +01:00
Promofaux b88fe572fe Whitelist/Blacklist domains directly in the Event Horizon. 2016-10-19 23:15:05 +01:00
Promofaux 59ba6f8aec add flag to skip download of lists 2016-10-19 22:06:19 +01:00
Promofaux 25343da6b7 wrong variable name 2016-10-19 20:03:29 +01:00
Promofaux 60d17b97f5 spacing 2016-10-19 19:51:32 +01:00
Promofaux 8cb72d87e4 make IPv4/IPv6 checking more robust in gravity 2016-10-19 19:50:21 +01:00
Dan Schaper 16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks 
Promo tweaks
 2016-10-18 17:37:52 -07:00
Adam Warner 76cae20c33 Merge pull request #803 from pi-hole/attributes 
Create .gitattributes
 2016-10-18 19:51:44 +01:00
Adam Warner b66f23cfd0 account for new update script 2016-10-18 14:19:44 +01:00
Adam Warner 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script 2016-10-18 14:19:25 +01:00
Adam Warner ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Adam Warner ce46c4dec4 remove prematurely added code 2016-10-18 12:11:02 +01:00
Adam Warner 77e8be09a1 handle passing arguments to version script 2016-10-18 12:07:42 +01:00
Adam Warner 013d77488a complete overhaul of version script. Now with optional arguments! 2016-10-18 12:07:11 +01:00
Adam Warner 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. 2016-10-18 12:05:48 +01:00
Adam Warner 97a013b2b7 Add direction to change upstream servers in setupVars.conf 2016-10-18 10:35:22 +01:00
Adam Warner 77808223dc remove stock comments from 01-pihole.conf and add warning to the top 2016-10-18 10:05:10 +01:00
Dan Schaper c4c6555814 Merge branch 'master' into development 2016-10-17 19:57:05 -07:00
Dan Schaper df0087fb23 Merge pull request #804 from pi-hole/hotfix/curlRefire 
Refire with curl
 2016-10-17 19:27:46 -07:00
Dan Schaper ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
Dan Schaper 0ad704e532 Update .gitattributes 2016-10-17 18:31:06 -07:00
Dan Schaper 2220d2dab8 Create .gitattributes 2016-10-17 18:28:38 -07:00
Promofaux 49f48e2aaa wrong word. #admincrimes 2016-10-17 22:24:59 +01:00
Adam Warner dce24df379 Merge pull request #794 from pi-hole/development 
[RELEASE] v2.9.3
 2016-10-17 15:45:21 +01:00
Adam Warner b59136c262 Merge pull request #800 from bcambl/ifcfg_backup 
fix typo
 2016-10-16 22:15:39 +01:00
bcambl fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
Adam Warner 5b736ae05e Merge pull request #799 from bcambl/ifcfg_backup 
use an excluded extension for ifcfg backup
 2016-10-16 20:50:54 +01:00
bcambl ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06:00
Adam Warner 123b16991b Merge pull request #798 from pi-hole/dnsmasqrestartchange 
Some bug fixes before release
 2016-10-16 17:25:30 +01:00
Promofaux 5792fc0bef change wording depending on choice 2016-10-16 17:23:26 +01:00
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development 2016-10-16 17:19:44 +01:00
Promofaux 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00