1338 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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	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
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
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