Dan Schaper
a0d47be088
Merge conflict resolution
2016-09-21 17:20:25 -07:00
Dan Schaper
521374e238
Update .pullapprove.yml
2016-09-21 16:53:50 -07:00
Jacob Salmela
34806ee2c2
1-10 codebase familiarity
...
Also tried to simplify the language a bit so as not to deter people
from submitting issues. We may need to simplify it more
2016-09-21 08:39:32 -05:00
Jacob Salmela
4a0d5138a1
move CONTRIBUTING.MD to .github
2016-09-20 15:30:27 -05:00
Jacob Salmela
e6a3758899
new template based on udemy-dl
2016-09-20 15:29:20 -05:00
Jacob Salmela
fcb7d9111e
new template based on udemy-dl
2016-09-20 15:14:15 -05:00
Jacob Salmela
d907731027
new template based on udemy-dl
2016-09-20 15:10:34 -05:00
Dan Schaper
ac8d295bb9
Merge pull request #668 from bcambl/dns-hostname-fixes
...
Dns hostname fixes
2016-09-20 10:16:15 -07:00
Jacob Salmela
a963beb96e
Merge pull request #703 from pi-hole/PromoFaux-patch-1
...
Add additional instruction.
2016-09-20 08:34:04 -05:00
Steve Dobinson
737b510116
Update lighttpd.conf.fedora
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
2016-09-20 10:38:58 +01:00
Steve Dobinson
47cba83450
Update lighttpd.conf.debian
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
2016-09-20 10:34:21 +01:00
bcambl
21d4199a38
Merge branch 'development' into dns-hostname-fixes
2016-09-19 17:33:32 -06:00
Adam Warner
655c422c3c
Add additional instruction.
...
Include "(Press space to select)" on ChooseInterface
2016-09-19 22:17:58 +01:00
Adam Warner
b6f8bd408f
Merge pull request #702 from pi-hole/PromoFaux-patch-1
...
Change reset_on_push to false
2016-09-19 21:12:33 +01:00
Adam Warner
a3edd0b976
Change reset_on_push to false
...
So we don't have to reapprove every time the branch is updated.
2016-09-19 21:06:28 +01:00
Adam Warner
8e8efa5caf
Merge pull request #695 from pi-hole/gravTweak
...
Enable support for /etc/pihole/setupVars.conf in gravity
2016-09-19 20:57:51 +01:00
Adam Warner
a41b8f62a2
Merge branch 'development' into gravTweak
2016-09-19 20:55:58 +01:00
Dan Schaper
452ee8c2df
Merge pull request #692 from pi-hole/PromoFaux-patch-1
...
Update piholeDebug.sh
2016-09-19 12:55:26 -07:00
Dan Schaper
5ca6599ca9
Merge branch 'development' into gravTweak
2016-09-19 12:54:58 -07:00
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54:04 +01:00
Adam Warner
1f4b43645b
Merge pull request #679 from pi-hole/updateTweaks
...
Make `pihole -up` a bit more intelligent
2016-09-19 20:46:22 +01:00
Promofaux
3d5140458b
Change cron job
2016-09-19 20:43:04 +01:00
Promofaux
f16574085f
remove code made redundant by the existence of /etc/pihole/setupVars.conf
2016-09-16 23:09:14 +01:00
Promofaux
3ed62d45f5
Source IP addresses from /etc/pihole/setupVars.conf
2016-09-16 23:05:08 +01:00
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
2016-09-15 15:16:06 +01:00
Promofaux
ec0c68621c
add blank line after Current version display
2016-09-12 19:40:34 +01:00
Promofaux
a0977af081
remove references to UpdateDashboard.sh
2016-09-12 19:10:12 +01:00
Promofaux
a3ef9efd2f
remove updateDashboard script
2016-09-12 19:09:19 +01:00
Promofaux
d58f7c6ec9
Remove references to dashboard update Script
2016-09-12 19:08:33 +01:00
Promofaux
d124c2c12e
Expand to check web admin versions
2016-09-12 18:57:19 +01:00
Promofaux
0229f70761
Make updatePiholeFunc a bit smarter. Only run update if version is not the latest.
2016-09-12 18:29:04 +01:00
Promofaux
dde9281139
Only pull master branch, the rest aren't needed!
2016-09-12 18:12:31 +01:00
Adam Warner
6eedfb572e
Merge pull request #676 from pi-hole/development
...
2.9.1
2016-09-12 14:56:25 +01:00
Adam Warner
edf81a232d
Merge pull request #671 from pi-hole/PromoFaux-patch-1
...
Add cron to apt-get dependencies
2016-09-09 20:23:34 +01:00
Adam Warner
c2cb92a0b0
Add cron to apt-get dependencies
2016-09-08 23:42:05 +01:00
bcambl
640af300cb
additional hostname checks in gravity.sh
...
- Test if /etc/hostname exists before attempting to cat the file.
- Add alternative hostname discovery via hostname command
- Add an error message to stdout if unable to determine host fqdn
2016-09-07 21:16:52 -06:00
bcambl
6c0c6182e9
fix newline in configureSelinux stdout
2016-09-07 21:16:52 -06:00
bcambl
05ad4445b5
add dns to sysconfig interface configuration
2016-09-07 21:16:51 -06:00
bcambl
1dd9f0747e
add gateway to interface configuration
...
pi-hole@9cb4e8b broke #593
original commit 8550b76
2016-09-07 21:16:36 -06:00
Dan Schaper
150e01be8b
Merge pull request #667 from pi-hole/piholeBashCompletionUpdate
...
Add the newer pihole command tags to the bash auto complete!
2016-09-06 15:02:13 -07:00
Promofaux
95ee3216c4
Add the newer pihole command tags to the bash auto complete!
2016-09-06 21:57:17 +01:00
Adam Warner
3b5e409b38
Merge pull request #666 from pi-hole/PromoFaux-patch-1
...
Change log flush time to 00:00
2016-09-06 19:30:36 +01:00
Adam Warner
eb201b614a
Change log flush time to 00:00
2016-09-06 19:29:30 +01:00
Adam Warner
162a6b8b5c
Merge pull request #665 from pi-hole/FleshOutPiholeQ
...
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
2016-09-06 19:25:03 +01:00
Promofaux
4ec01769cb
Appease Jacob.
2016-09-06 19:21:56 +01:00
Promofaux
19b656132d
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
2016-09-06 19:16:04 +01:00
Adam Warner
6305c7e2ab
Merge pull request #663 from pi-hole/Bugfix660
...
Switch fedora and debian install check order
2016-09-05 18:32:55 +01:00
Promofaux
04c60e8a1c
Switch fedora and debian install check order
2016-09-05 15:52:09 +01:00
Adam Warner
b6ceb06a32
Merge pull request #655 from pi-hole/PromoFaux-patch-1
...
Replace `truncate` command with `echo " " >`
2016-09-02 19:34:50 +01:00
Adam Warner
8cb2f85a08
Replace truncate command with echo " " >
2016-09-02 16:39:34 +01:00
