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-04 12:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
1328 commits 8 branches 109 tags 27 MiB
Commit graph

1328 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Eric Warnke
6c1df57965 Make installer work on centos 6 and warn that web ui is broken 2016-10-24 22:31:15 -04:00
Eric Warnke
e36ff00227 Make installer work on centos 6 and warn that web ui is broken 2016-10-24 22:28:32 -04:00
Dan Schaper
2f8015cbca Update PULL_REQUEST_TEMPLATE.md 2016-10-24 14:50:47 -07:00
Dan Schaper
f3bf7c4b38 Update ISSUE_TEMPLATE.md 2016-10-24 14:48:38 -07:00
Adam Warner
e37c4d57da Merge pull request #842 from pi-hole/Fix/template-spacing 
fix check box spacing
 2016-10-25 02:32:34 +06:00
Jacob Salmela
acff90c000 fix check box spacing 
I have seen several issues/PRs with the extra space.  removing the
extra whitespace might help to keep the formatting when being submitted.
 2016-10-24 14:58:13 -05:00
Adam Warner
5f9e72dd71 Merge pull request #835 from pi-hole/debugFixes 
Debug script tweaks.
 2016-10-24 19:40:27 +06:00
Adam Warner
be0bcb8f7d Merge pull request #838 from airencracken/hotfix-missing-newline 
Fix missing newline
 2016-10-24 15:48:53 +06:00
Adam Warner
44c3d56439 Merge pull request #836 from pi-hole/UdemyAttribution 
Udemy attribution
 2016-10-24 13:54:14 +06:00
Marcus Hildum
519d731ddd Fix missing newline 
My mistake
 2016-10-23 16:45:51 -07:00
Dan Schaper
119c00c22a Merge pull request #837 from pi-hole/UdemyAttribution-1 
Update PULL_REQUEST_TEMPLATE.md
 2016-10-23 15:53:27 -07:00
Dan Schaper
12596dd697 Update PULL_REQUEST_TEMPLATE.md 2016-10-23 15:50:59 -07:00
Dan Schaper
cb38f5f0d7 Move attribution to bottom since our bots quote from top 
Bot's keeps quoting the attribution line in snippets (Discourse, GitLab, Mattermost)
 2016-10-23 15:50:03 -07:00
Promofaux
b49384ffe4 intent 2016-10-23 22:44:21 +01:00
Promofaux
7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt 2016-10-23 22:44:06 +01:00
Promofaux
bd0cc134bf MERGE FAIL :ashamed_face: 2016-10-23 22:43:11 +01:00
Promofaux
476fd1f695 indentation 2016-10-23 22:38:18 +01:00
Promofaux
96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt 2016-10-23 22:38:06 +01:00
Promofaux
c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function 2016-10-23 22:31:20 +01:00
Promofaux
2b2c240d39 Fix shebang line broken in #831 
Remove root check and references to ${SUDO}

Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
 2016-10-23 22:15:10 +01:00
Adam Warner
1f0ae16216 Merge pull request #831 from airencracken/development 
Consistent Style in Bash
 2016-10-23 20:03:30 +01:00
Promofaux
b79392ba2c exit after displaying white/blacklist 2016-10-23 19:49:51 +01:00
Promofaux
8ee98f0a4a remove a space 2016-10-23 19:47:31 +01:00
Promofaux
82e78fb651 Add output to pihole disable and pihole enable 2016-10-23 19:44:40 +01:00
Promofaux
d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev 2016-10-23 19:33:28 +01:00
Promofaux
ff588200c0 Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond 2016-10-23 19:11:36 +01:00