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
Adam Warner
0de74c0448
Merge pull request #848 from pi-hole/PromoFaux-patch-1
...
Update .pullapprove.yml
2016-10-25 17:38:04 +06:00
Adam Warner
ee927346b7
Update .pullapprove.yml
...
Update to V2. Only require 2 approvers on development, and 3 on master
2016-10-25 12:36:05 +01: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
Marcus Hildum
7ebaf8e843
Consistency
...
Now with block indents!
2016-10-21 23:23:31 -07:00
Marcus Hildum
640398ced4
Consistency
...
We went with tabs earlier, may as well make that the "standard".
Easy enough to switch to spaces too if that's desired with expand(1)
2016-10-21 23:17:14 -07:00
Marcus Hildum
ebbe1fc236
More consistency
...
Odd mix of variables quoted with and without no-op parameter expansion
(i.e. ${thing})
More ${thing} than not, make that the standard
2016-10-21 23:11:17 -07:00
Marcus Hildum
aac8e45397
Imbue gravity.sh with some consistency
...
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the
loop statement; do
done
style over the newline for do since it seemed to be more common.
2016-10-21 23:02:45 -07:00
Marcus Hildum
5ebfa5ecf7
heredoc for helpfunc in pihole
2016-10-21 22:53:04 -07:00
Marcus Hildum
12e041c9ef
Merge remote-tracking branch 'upstream/development' into development
2016-10-21 22:49:21 -07:00
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
