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-03 19:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
1359 commits 8 branches 109 tags 27 MiB
Commit graph

1359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Warnke
1e9cb37d63 Merge branch 'development' of https://github.com/pi-hole/pi-hole into alpine_support 2016-10-28 13:18:18 -04:00
Dan Schaper
e22aca49c8 Merge pull request #813 from das7pad/development 
Create missing directory for lighttpd
 2016-10-28 10:05:08 -07:00
Dan Schaper
cbfad28f7e Merge pull request #873 from pi-hole/PromoFaux-patch-2 
Create .codeclimate.yml
 2016-10-28 07:04:53 -07:00
Adam Warner
6a4a468022 Create .codeclimate.yml 2016-10-28 15:02:03 +01:00
Jacob Salmela
473b58d26d Merge pull request #704 from stonedbovines/development 
lighttpd.conf templates change
 2016-10-27 20:22:46 -05:00
Adam Warner
7e9498f04c Merge pull request #869 from pi-hole/feature/listen-address-1 
Remove `listen-address` directive
 2016-10-27 19:59:58 +01:00
Dan Schaper
300001e766 Remove listen-address directive 
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
 2016-10-27 11:56:16 -07:00
Adam Warner
21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Adam Warner
a38edd891f Merge pull request #867 from pi-hole/gravTweaks 
No need to reference script that does not exist...
 2016-10-27 18:09:28 +01:00
Promofaux
794fa21137 install uninstall.sh... 2016-10-27 12:44:21 +01:00
Eric Warnke
f956489f99 Merge branch 'development' of https://github.com/pi-hole/pi-hole into alpine_support 2016-10-27 07:38:26 -04:00
Promofaux
cde003bc98 \ all the /s! 2016-10-27 11:13:00 +01:00
Promofaux
9e4e1d1cb2 improve comments 2016-10-27 11:09:24 +01:00
Promofaux
60142cd960 remove reference to whitelist.sh (no longer exists) replace with pihole -w 2016-10-27 11:06:11 +01:00
Adam Warner
3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist 
Improvements to White and Blacklists
 2016-10-26 19:52:16 +01:00
Eric Warnke
5a626cc66f Merge branch 'development' of https://github.com/pi-hole/pi-hole into alpine_support 2016-10-26 14:11:03 -04:00
Dan Schaper
7c89b6934a Merge pull request #860 from brontide/screen_detection 
Screen detection, sane minimums for whiptail dailogs
 2016-10-26 11:06:43 -07:00
Adam Warner
380a19274d Merge pull request #861 from brontide/lighttpd_bug2526_fix 
[test] fix known bug with older lighttpd syntax
 2016-10-26 19:04:20 +01:00
Eric Warnke
f1c1caf7bd url.rewrite does not work in $HTTP block lighttpd bug #2526 2016-10-26 11:49:42 -04:00
Eric Warnke
e2997b8135 Due to lighttpd bug 2526 the url.rewrite for javascript must be placed 
outside of the $HTTP block or it will never evaluate.
 2016-10-26 11:49:31 -04:00
Eric Warnke
4ed6e4d016 Tiny screens get sane minimums 2016-10-26 11:15:02 -04:00
Eric Warnke
ac8d24a1ce Even with no detected screen size, it should presume 80x24 2016-10-26 11:14:54 -04:00
Eric Warnke
fc776921d5 stty is more compatible and does not require any additional dependancies for busybox 2016-10-26 11:14:46 -04:00
Eric Warnke
0b19bacc1b Tiny screens get sane minimums 2016-10-26 10:44:15 -04:00
Eric Warnke
3bcc93d921 Even with no detected screen size, it should presume 80x24 2016-10-26 10:08:23 -04:00
Eric Warnke
e099603ca8 stty is more compatible and does not require any additional dependancies for busybox 2016-10-26 09:59:22 -04:00
Adam Warner
55a653aca4 clear out /opt/pihole folder before installing scripts 2016-10-26 10:00:00 +01:00
Adam Warner
0d6a6b97f9 remove whitelist and blacklist scripts 2016-10-26 09:56:45 +01:00
Adam Warner
469ff45f01 create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication. 
update pihole script to reflect new white/blacklist command.
 2016-10-26 09:36:02 +01:00
Dan Schaper
bc077acfb8 Merge pull request #853 from pi-hole/gravFix 
Gravity fix
 2016-10-25 21:57:47 -07:00
Eric Warnke
877ebb3d56 Alpha support for Alpine linux, all the fun, half the size 2016-10-25 21:07:30 -04:00
Eric Warnke
f6d514235d Last fixes 2016-10-25 19:04:15 -04:00
Promofaux
4c853defb2 add if traps to check for existence of whitelist.txt / blacklist.txt 2016-10-25 22:27:35 +01:00
Eric Warnke
0fde38176e More cleanup for rpm based systems including dependacies and remove iptables firewall since it won't stay between reboots 2016-10-25 15:49:57 -04:00
Eric Warnke
898f50d8a8 url.rewrite does not work in $HTTP block lighttpd bug #2526 2016-10-25 14:48:32 -04:00
Eric Warnke
13f4fc3b25 Due to lighttpd bug 2526 the url.rewrite for javascript must be placed 
outside of the $HTTP block or it will never evaluate.
 2016-10-25 14:46:26 -04:00
Eric Warnke
bad8b293cf Fix install for debian7, now exhibits the same issue as ubnuntu 14.04 not returning the expected js payload 2016-10-25 12:11:32 -04:00
Adam Warner
bd0db56ba0 actually fix up logic 2016-10-25 15:29:02 +01:00
Adam Warner
95f0b3710d fix up logic 2016-10-25 15:27:13 +01:00
Eric Warnke
38a1b0c05b Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2016-10-25 10:09:00 -04:00
Adam Warner
e0ac109dd1 remove hostname insertion into gravity.list from gravity.sh 2016-10-25 15:07:29 +01:00
Adam Warner
86349527e7 replace HOSTNAME tokens in 01-pihole.conf 2016-10-25 15:06:37 +01:00
Adam Warner
18005ceee8 add hostname lines in 01-pihole.conf 2016-10-25 15:03:49 +01:00
Adam Warner
7653b3d088 Remove pi.hole references in gravity.sh 2016-10-25 15:01:16 +01:00
Adam Warner
911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution. 2016-10-25 15:00:18 +01:00
Adam Warner
eb52f81a5c add pi.hole entries to 01-pihole.conf 2016-10-25 14:54:10 +01:00
Adam Warner
4839953328 Merge pull request #844 from pi-hole/EnforceTemplate 
Update ISSUE_TEMPLATE.md
 2016-10-25 17:57:06 +06:00
Adam Warner
aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond 
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
 2016-10-25 17:43:40 +06:00
Eric Warnke
24bc3fafd9 merge fix2 2016-10-24 23:27:57 -04:00
Eric Warnke
acbdea8bd5 merge fix 2016-10-24 23:24:55 -04:00