Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 14:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
1418 commits 11 branches 109 tags 28 MiB
Commit graph

1418 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Hildum
54913f06a3 Merge remote-tracking branch 'upstream/master' into development 2016-10-21 22:49:13 -07:00
Adam Warner
44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning 
Add file change warning to header
 2016-10-21 11:24:12 +01:00
Adam Warner
8f9ff930b3 Merge pull request #823 from tuplink/EnableOrDisable 
Enable or disable
 2016-10-21 11:02:10 +01:00
tuplink
e199f6db87 spelling updates 2016-10-20 21:15:11 -04:00
tuplink
c83dd3ccd7 change spacing 2016-10-20 18:45:27 -04:00
tuplink
78fbafa1cd test out new status logic 2016-10-20 18:40:03 -04:00
Promofaux
c0012540ed Re-add shebang 2016-10-20 21:08:07 +01:00
Promofaux
9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond 
# Conflicts:
#	advanced/Scripts/blacklist.sh
#	advanced/Scripts/whitelist.sh
 2016-10-20 21:06:28 +01:00
Tommy Huff
685b775b68 rework status if statments 2016-10-20 11:24:34 -04:00
Tommy Huff
9056a5a7b6 fix spelling / replace tabs with spaces in help 2016-10-20 11:05:49 -04:00
Tommy Huff
e1c56bcbfe remove a commit in whitelist 2016-10-20 10:19:03 -04:00
Tommy Huff
15d68467a1 attempt to fix 2016-10-20 10:12:02 -04:00
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
Dan Schaper
e6bd979aeb Can't spell 
Fix spelling error
 2016-10-20 04:27:12 -07:00
Adam Warner
266c160108 Merge pull request #818 from airencracken/development 
Standardize function declaration
 2016-10-20 12:01:41 +01:00
Dan Schaper
b5b6350cc7 Add file change warning to header 2016-10-20 03:42:25 -07: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
Dan Schaper
60a80dd678 Merge pull request #819 from pi-hole/adlistremoval 
Remove problem list, sends in Unicode - Not adware
 2016-10-20 02:41:22 -07:00
Marcus Hildum
0efda04920 Use heredocs instead of multiple calls to echo 
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
 2016-10-19 20:46:37 -07:00
Dan Schaper
8819e58882 Remove problem list, sends in Unicode - Not adware 
Fixes #816
 2016-10-19 20:15:36 -07:00
Marcus Hildum
28eeaf201b Standardize function declaration 
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
 2016-10-19 19:47:45 -07: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
Jakob Ackermann
8872594ab9 create upload dir for lighttpd 
directory is missing in the installation process but is used in the
lighttpd.conf
 2016-10-19 14:27:17 +02:00
Jakob Ackermann
b50584119b Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development 2016-10-19 14:24:02 +02:00
Jakob Ackermann
975f4f2a17 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development 2016-10-19 14:15:06 +02: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