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
b49384ffe4
intent
2016-10-23 22:44:21 +01:00
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
2016-10-23 22:44:06 +01:00
bd0cc134bf
MERGE FAIL :ashamed_face:
2016-10-23 22:43:11 +01:00
476fd1f695
indentation
2016-10-23 22:38:18 +01:00
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
2016-10-23 22:38:06 +01:00
c958bed418
Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function
2016-10-23 22:31:20 +01:00
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
1f0ae16216
Merge pull request #831 from airencracken/development
...
Consistent Style in Bash
2016-10-23 20:03:30 +01:00
b79392ba2c
exit after displaying white/blacklist
2016-10-23 19:49:51 +01:00
8ee98f0a4a
remove a space
2016-10-23 19:47:31 +01:00
82e78fb651
Add output to pihole disable and pihole enable
2016-10-23 19:44:40 +01:00
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
2016-10-23 19:33:28 +01:00
ff588200c0
Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond
2016-10-23 19:11:36 +01:00
5d6072524c
Consistency
...
Missed one
2016-10-22 10:26:00 -07:00
07a66a70fc
Consistency
...
More of the same
2016-10-22 10:12:05 -07:00
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
a30c75ef71
Consistency
...
Cleanup!
2016-10-22 00:35:44 -07:00
d0b3727c5d
Consistency
...
Yet more cleanup
2016-10-22 00:32:36 -07:00
6e94bf5b6d
Consistency
...
You know the drill
2016-10-22 00:14:38 -07:00
0f04e270a7
consistency
...
Just more cleanup
2016-10-22 00:10:25 -07:00
ec4f5007e7
remove bad {
2016-10-21 23:59:31 -07:00
21b906e0e0
Consistency
...
More of the same
2016-10-21 23:57:47 -07:00
7ebaf8e843
Consistency
...
Now with block indents!
2016-10-21 23:23:31 -07:00
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
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
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
5ebfa5ecf7
heredoc for helpfunc in pihole
2016-10-21 22:53:04 -07:00
12e041c9ef
Merge remote-tracking branch 'upstream/development' into development
2016-10-21 22:49:21 -07:00
54913f06a3
Merge remote-tracking branch 'upstream/master' into development
2016-10-21 22:49:13 -07:00
44a36368a2
Merge pull request #822 from pi-hole/ChangeWarning
...
Add file change warning to header
2016-10-21 11:24:12 +01:00
8f9ff930b3
Merge pull request #823 from tuplink/EnableOrDisable
...
Enable or disable
2016-10-21 11:02:10 +01:00
e199f6db87
spelling updates
2016-10-20 21:15:11 -04:00
c83dd3ccd7
change spacing
2016-10-20 18:45:27 -04:00
78fbafa1cd
test out new status logic
2016-10-20 18:40:03 -04:00
c0012540ed
Re-add shebang
2016-10-20 21:08:07 +01:00
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
685b775b68
rework status if statments
2016-10-20 11:24:34 -04:00
9056a5a7b6
fix spelling / replace tabs with spaces in help
2016-10-20 11:05:49 -04:00
e1c56bcbfe
remove a commit in whitelist
2016-10-20 10:19:03 -04:00
15d68467a1
attempt to fix
2016-10-20 10:12:02 -04:00
3b6ecc573e
fix conflict
...
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
2016-10-20 10:09:23 -04:00
9427b1e594
Merge branch 'promoTweaksTheSecond' into EnableOrDisable
2016-10-20 09:55:22 -04:00
3ca3eaa62c
change restartdnsmasq to restartdns
2016-10-20 09:40:45 -04:00
dda448e050
use finction in pihole to restart dnsmasq
2016-10-20 09:15:03 -04:00
60873144ea
make last line of script return a new line been bugging me for awhile
2016-10-20 09:09:35 -04:00
a9d17c96be
include status at end of gravity so if it is disabled you will see it when running
2016-10-20 09:03:20 -04:00
aaee895b2b
add pihole status web option to return 1 or 0 for easy use with php
2016-10-20 08:58:36 -04:00
7d7e17b351
add toggle to enable or disable pi-hole
2016-10-20 08:45:20 -04:00
c71a976e76
kill off an old ugly hack
2016-10-20 13:37:07 +01:00
Dan Schaper