Jacob Salmela
3748a0ed33
Merge pull request #1267 from pi-hole/tweak/license
...
update license to EUPL on core files
2017-02-22 15:51:54 -06:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
Jacob Salmela
0fe5efba76
Merge pull request #1265 from ProtoFoo/ProtoFoo-redirect
...
Redirect pi.hole to pi.hole/admin/
2017-02-21 15:49:19 -06:00
ProtoFoo
fb6631d317
Removed a line that did nothing.
2017-02-21 22:22:30 +01:00
ProtoFoo
cd0b8927c5
Removed a line that did nothing.
2017-02-21 22:22:03 +01:00
ProtoFoo
3fab34687c
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:38:09 +01:00
ProtoFoo
b2d78edae9
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:36:59 +01:00
ProtoFoo
412cacac49
Merge pull request #1 from pi-hole/development
...
Development
2017-02-21 19:10:47 +01:00
Adam Warner
fcc3d5450d
Merge pull request #1263 from pi-hole/idea
...
accidentally the idea file
2017-02-20 22:16:50 +00:00
Adam Warner
86c6e0e826
accidentally the idea file
2017-02-20 21:36:27 +00:00
Adam Warner
5c223b5f4e
Merge pull request #1262 from pi-hole/gitAttributes
...
linux style line endings enforced
2017-02-20 21:28:16 +00:00
Adam Warner
763b51fe22
linux style line endings enforced
2017-02-20 21:12:04 +00:00
DL6ER
66ae79f9b8
Merge pull request #1259 from friimaind/patch-1
...
Added my personal project Pi-hole Droid to the Projects's list
2017-02-20 10:49:00 +01:00
Massimiliano Monaro
7da076df18
Added my personal project Pi-hole Droid to the Projects's list
...
Pi-hole Droid is an unofficial client that connects to your Pi-hole to show charts and statistics.
2017-02-20 10:04:14 +01:00
Adam Warner
45fbadbb26
Merge pull request #1257 from pi-hole/revert-1241-feature/redirect-pi-hole-to-admin
...
Revert "redirect pi.hole to pi.hole/admin"
2017-02-20 02:10:13 +00:00
Adam Warner
a7def771c8
Revert "redirect pi.hole to pi.hole/admin"
2017-02-19 20:12:32 +00:00
Adam Warner
543f1243e2
Merge pull request #1241 from pi-hole/feature/redirect-pi-hole-to-admin
...
redirect pi.hole to pi.hole/admin
2017-02-18 20:59:03 +00:00
Adam Warner
a001443ad7
Merge pull request #1252 from pi-hole/tweak/debug_IP
...
Debug IP stack fixes
2017-02-18 19:33:54 +00:00
Adam Warner
36166c129a
Merge pull request #1253 from Skittels0/even_more_dns
...
Adds DNS.WATCH to default dns servers
2017-02-18 19:12:32 +00:00
Skittels
4e7a485e23
Update basic-install.sh
2017-02-18 13:42:13 +01:00
Skittels
9e5795bf55
Added DNS.WATCH to default dns servers
2017-02-18 13:03:40 +01:00
Dan Schaper
053b38e0bd
Set up for IP matching in detection.
2017-02-16 19:45:44 -08:00
Dan Schaper
2aa3a109a0
Ping gateways and Internet.
2017-02-16 18:38:05 -08:00
Dan Schaper
472708376d
Split out IP checks.
2017-02-16 18:30:15 -08:00
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions.
2017-02-16 16:49:14 -08:00
Adam Warner
95fd9d4863
Merge pull request #1248 from IanOliver/patch-3
...
Update malwaredomains.com and mahakala.is URLs to HTTPS
2017-02-16 08:07:18 +00:00
Ian Oliver
c89bca6ec8
Update malwaredomains.com and mahakala.is URLs to HTTPS
2017-02-15 21:31:42 +00:00
Dan Schaper
ee262c30c2
Merge pull request #1245 from pi-hole/readme/magic-mirror-project
...
add magic mirror project link to readme
2017-02-14 19:21:27 -08:00
Jacob Salmela
6b8240d4de
add magic mirror project link to readme
2017-02-14 20:25:11 -06:00
Jacob Salmela
26cb6a1929
redirect pi.hole to pi.hole/admin
2017-02-11 20:46:27 -06:00
Jacob Salmela
7c63bbfe44
Merge pull request #1233 from ProtoFoo/patch-1
...
Add manual edit warnings to lighttpd.conf.* files
2017-02-11 08:10:35 -06:00
Adam Warner
109026222e
Merge pull request #1237 from IanOliver/patch-1
...
Spelling corrections in adlists.default comments
2017-02-10 23:43:11 +00:00
DL6ER
af8e629df4
Merge pull request #1239 from pi-hole/tweak/debug48h
...
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 20:46:12 +01:00
DL6ER
f7f1daa69f
Merge pull request #1238 from pi-hole/tweak/debugLogdnsmasq
...
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 20:46:01 +01:00
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 17:45:20 +01:00
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 17:42:37 +01:00
Ian Oliver
692292b1d4
Spelling corrections in comments
2017-02-10 11:22:14 +00:00
Mcat12
cd608d9d5b
Merge pull request #1182 from pi-hole/adminPageAsOption
...
Give user the choice to install web admin or not
2017-02-09 20:20:08 -05:00
Mcat12
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
ProtoFoo
162d9d7d57
Add manual edit warning
...
Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 17:00:52 +01:00
ProtoFoo
357f5a2cfd
Add manual edit warning
...
Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 16:46:55 +01:00
Mcat12
d1ca32b0a5
Merge pull request #1231 from pi-hole/fix/iproute_deps
...
Update basic-install.sh
2017-02-09 10:12:05 -05:00
Dan Schaper
34f326c559
Update basic-install.sh
2017-02-08 14:13:49 -08:00
DL6ER
7785dac50e
Merge pull request #1228 from r0ckarong/development
...
Justify and improve help texts, add missing wildcard description
2017-02-08 14:05:53 +01:00
Markus Napp
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
Markus Napp
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
Markus Napp
19e30b829a
Add wildcard description to help text, improve other help texts
2017-02-08 12:42:14 +01:00
Markus Napp
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
Mcat12
a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
DL6ER
5ac92ae4eb
Merge pull request #1222 from pi-hole/fix/installer
...
Remove double echos
2017-02-07 09:21:22 +01:00
