Adam Warner
86349527e7
replace HOSTNAME tokens in 01-pihole.conf
8 years ago
Adam Warner
18005ceee8
add hostname lines in 01-pihole.conf
8 years ago
Adam Warner
7653b3d088
Remove pi.hole references in gravity.sh
8 years ago
Adam Warner
911053f63f
Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
8 years ago
Adam Warner
eb52f81a5c
add pi.hole entries to 01-pihole.conf
8 years ago
Adam Warner
4839953328
Merge pull request #844 from pi-hole/EnforceTemplate
...
Update ISSUE_TEMPLATE.md
8 years ago
Adam Warner
aba0d93fda
Merge pull request #814 from pi-hole/promoTweaksTheSecond
...
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
8 years ago
Adam Warner
0de74c0448
Merge pull request #848 from pi-hole/PromoFaux-patch-1
...
Update .pullapprove.yml
8 years ago
Adam Warner
ee927346b7
Update .pullapprove.yml
...
Update to V2. Only require 2 approvers on development, and 3 on master
8 years ago
Dan Schaper
2f8015cbca
Update PULL_REQUEST_TEMPLATE.md
8 years ago
Dan Schaper
f3bf7c4b38
Update ISSUE_TEMPLATE.md
8 years ago
Adam Warner
e37c4d57da
Merge pull request #842 from pi-hole/Fix/template-spacing
...
fix check box spacing
8 years ago
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.
8 years ago
Adam Warner
5f9e72dd71
Merge pull request #835 from pi-hole/debugFixes
...
Debug script tweaks.
8 years ago
Adam Warner
be0bcb8f7d
Merge pull request #838 from airencracken/hotfix-missing-newline
...
Fix missing newline
8 years ago
Adam Warner
44c3d56439
Merge pull request #836 from pi-hole/UdemyAttribution
...
Udemy attribution
8 years ago
Marcus Hildum
519d731ddd
Fix missing newline
...
My mistake
8 years ago
Dan Schaper
119c00c22a
Merge pull request #837 from pi-hole/UdemyAttribution-1
...
Update PULL_REQUEST_TEMPLATE.md
8 years ago
Dan Schaper
12596dd697
Update PULL_REQUEST_TEMPLATE.md
8 years ago
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)
8 years ago
Promofaux
b49384ffe4
intent
8 years ago
Promofaux
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
8 years ago
Promofaux
bd0cc134bf
MERGE FAIL :ashamed_face:
8 years ago
Promofaux
476fd1f695
indentation
8 years ago
Promofaux
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
8 years ago
Promofaux
c958bed418
Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
8 years ago
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
8 years ago
Adam Warner
1f0ae16216
Merge pull request #831 from airencracken/development
...
Consistent Style in Bash
8 years ago
Promofaux
b79392ba2c
exit after displaying white/blacklist
8 years ago
Promofaux
8ee98f0a4a
remove a space
8 years ago
Promofaux
82e78fb651
Add output to `pihole disable` and `pihole enable`
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Promofaux
ff588200c0
Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond
8 years ago
Marcus Hildum
5d6072524c
Consistency
...
Missed one
8 years ago
Marcus Hildum
07a66a70fc
Consistency
...
More of the same
8 years ago
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.
8 years ago
Marcus Hildum
a30c75ef71
Consistency
...
Cleanup!
8 years ago
Marcus Hildum
d0b3727c5d
Consistency
...
Yet more cleanup
8 years ago
Marcus Hildum
6e94bf5b6d
Consistency
...
You know the drill
8 years ago
Marcus Hildum
0f04e270a7
consistency
...
Just more cleanup
8 years ago
Marcus Hildum
ec4f5007e7
remove bad {
8 years ago
Marcus Hildum
21b906e0e0
Consistency
...
More of the same
8 years ago
Marcus Hildum
7ebaf8e843
Consistency
...
Now with block indents!
8 years ago
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)
8 years ago
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
8 years ago
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.
8 years ago
Marcus Hildum
5ebfa5ecf7
heredoc for helpfunc in pihole
8 years ago
Marcus Hildum
12e041c9ef
Merge remote-tracking branch 'upstream/development' into development
8 years ago
Marcus Hildum
54913f06a3
Merge remote-tracking branch 'upstream/master' into development
8 years ago
Adam Warner
44a36368a2
Merge pull request #822 from pi-hole/ChangeWarning
...
Add file change warning to header
8 years ago