Eric Warnke
|
977d1d1998
|
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
|
2016-10-27 07:37:40 -04: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
|
3a4fe3e391
|
Wheezy install fix by selecting appropriate deps, made the php check the same
|
2016-10-26 14:47:29 -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 |
|
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 |
|
Promofaux
|
4c853defb2
|
add if traps to check for existence of whitelist.txt / blacklist.txt
|
2016-10-25 22:27:35 +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 |
|
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 |
|
Marcus Hildum
|
5d6072524c
|
Consistency
Missed one
|
2016-10-22 10:26:00 -07:00 |
|
Marcus Hildum
|
07a66a70fc
|
Consistency
More of the same
|
2016-10-22 10:12:05 -07:00 |
|
Marcus Hildum
|
69ba8a3c2f
|
Consistency
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
|
2016-10-22 10:01:15 -07:00 |
|
Marcus Hildum
|
a30c75ef71
|
Consistency
Cleanup!
|
2016-10-22 00:35:44 -07:00 |
|
Marcus Hildum
|
d0b3727c5d
|
Consistency
Yet more cleanup
|
2016-10-22 00:32:36 -07:00 |
|
Marcus Hildum
|
6e94bf5b6d
|
Consistency
You know the drill
|
2016-10-22 00:14:38 -07:00 |
|
Marcus Hildum
|
0f04e270a7
|
consistency
Just more cleanup
|
2016-10-22 00:10:25 -07:00 |
|
Marcus Hildum
|
ec4f5007e7
|
remove bad {
|
2016-10-21 23:59:31 -07:00 |
|
Marcus Hildum
|
21b906e0e0
|
Consistency
More of the same
|
2016-10-21 23:57:47 -07:00 |
|