DL6ER
|
f082b5ba54
|
Merge pull request #1001 from pi-hole/cleanup/remove_legacy_detect
Remove v1 legacy detection code.
|
2016-12-21 13:49:34 +01:00 |
|
DL6ER
|
8841bdd252
|
Reset the if's
|
2016-12-21 12:57:02 +01:00 |
|
DL6ER
|
58261098fb
|
We should not call a function that Dan deleted
|
2016-12-21 12:07:44 +01:00 |
|
DL6ER
|
9432d3035a
|
Merge branch 'development' into cleanup/remove_legacy_detect
Conflicts:
automated install/basic-install.sh
|
2016-12-21 12:01:58 +01:00 |
|
DL6ER
|
d42caa8672
|
Merge pull request #1000 from pi-hole/fix/tab_space
Tabs to spaces and formatting.
|
2016-12-21 11:41:30 +01:00 |
|
Dan Schaper
|
8117ec8e20
|
Remove v1 legacy detection code.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2016-12-20 17:50:44 -08:00 |
|
Dan Schaper
|
ff2783f9fc
|
Tabs to spaces and formatting.
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
|
2016-12-20 17:22:57 -08:00 |
|
DL6ER
|
a9cb93d801
|
Merge pull request #998 from pi-hole/LordKelvin
Lord Kelvin
|
2016-12-20 17:54:52 +01:00 |
|
DL6ER
|
ee8f29d178
|
Fixed typo, extended help text
|
2016-12-20 16:28:28 +01:00 |
|
DL6ER
|
da363070c7
|
Added Kelvin
|
2016-12-20 12:21:08 +01:00 |
|
DL6ER
|
50cf891e01
|
Merge pull request #996 from pi-hole/allowemptysecondDNSserver
Allow disabling second DNS server
|
2016-12-19 19:30:27 +01:00 |
|
DL6ER
|
715838cf89
|
Allow disabling second DNS server
|
2016-12-19 13:42:42 +01:00 |
|
DL6ER
|
372c699cc6
|
Merge pull request #993 from pi-hole/fix/one_step_refactor
Rename variables in one step
|
2016-12-17 00:15:20 +01:00 |
|
Dan Schaper
|
8cb01cdd29
|
One step to rename variables.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2016-12-16 15:08:30 -08:00 |
|
Adam Warner
|
10982a0f45
|
Merge pull request #990 from pi-hole/dontkillsetupVars.conf
Don't kill setupVars.conf on update/fresh install
|
2016-12-16 13:55:33 +00:00 |
|
DL6ER
|
d4c378ed5d
|
Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
|
2016-12-16 13:20:25 +01:00 |
|
DL6ER
|
7872f68a45
|
Only try to remove parts inthe file if the file already exists
|
2016-12-16 13:13:35 +01:00 |
|
DL6ER
|
ec8c848106
|
Don't kill already existing setupVars.conf on update (and fresh install)
|
2016-12-16 12:53:00 +01:00 |
|
Mcat12
|
3b50ce8c54
|
Merge pull request #977 from pi-hole/activatewebUIpw
Add password to webUI after update if there is none
|
2016-12-15 14:05:11 -05:00 |
|
DL6ER
|
1eeaa01234
|
Always put the information that we added a password if we did (not only on update but also on fresh install)
|
2016-12-15 15:22:44 +01:00 |
|
DL6ER
|
e2898217d2
|
Made message shorter
|
2016-12-15 15:20:41 +01:00 |
|
DL6ER
|
f81dadc5d0
|
Fix final message
|
2016-12-15 14:10:55 +01:00 |
|
Mcat12
|
a0019d86c5
|
Merge pull request #983 from pi-hole/cronpath
Fix missing path information for cron
|
2016-12-15 07:01:20 -05:00 |
|
Adam Warner
|
4348653431
|
Merge pull request #985 from pi-hole/pi.hole
A man has no name. Even though his name is Jaqen H'ghar
|
2016-12-15 08:49:22 +00:00 |
|
Dan Schaper
|
09cfa9bb20
|
Merge pull request #986 from pi-hole/autoCompletes
add missing pihole autocomplete commands
|
2016-12-14 12:58:50 -08:00 |
|
Promofaux
|
e7713a9028
|
add missing pihole autocomplete commands
|
2016-12-14 19:53:40 +00:00 |
|
Promofaux
|
906a1753be
|
specifically comment out gravity.list addn-host
|
2016-12-14 19:42:20 +00:00 |
|
Promofaux
|
a3d519b671
|
no need to remove list, because of echo >
|
2016-12-14 19:33:15 +00:00 |
|
Promofaux
|
8591f9d576
|
check for list before removing it
|
2016-12-14 19:31:57 +00:00 |
|
Promofaux
|
c10ec5548f
|
remove code that replaces tokens in 01-pihole.conf
|
2016-12-14 19:29:44 +00:00 |
|
Promofaux
|
684ac98c8e
|
Remove hostname and pi.hole entries, move to /etc/pihole/local.list
|
2016-12-14 19:28:01 +00:00 |
|
Promofaux
|
db89fa9881
|
initial support for additional hosts file
|
2016-12-14 19:26:55 +00:00 |
|
Adam Warner
|
9a80421d73
|
Merge pull request #981 from pi-hole/quiet-dhcp
Improvement of backend of web UI Settings page
|
2016-12-14 19:11:49 +00:00 |
|
Mcat12
|
2ddacf40c0
|
Merge pull request #984 from pi-hole/Mcat12-auto-ipv6
Automatically enable IPv6
|
2016-12-14 13:59:55 -05:00 |
|
Mcat12
|
92f4824884
|
Automatically enable IPv6
|
2016-12-14 13:52:14 -05:00 |
|
DL6ER
|
9a2ffabc33
|
Fix missing path information
|
2016-12-14 17:33:20 +01:00 |
|
DL6ER
|
2977168da1
|
dnsmasq "bogus-priv" property
|
2016-12-14 16:16:25 +01:00 |
|
DL6ER
|
85e3f37503
|
dnsmasq "domain-needed" property
|
2016-12-14 16:09:57 +01:00 |
|
DL6ER
|
ba015c1918
|
Set domain name via Settings page
|
2016-12-14 14:24:09 +01:00 |
|
DL6ER
|
1556adb678
|
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
|
2016-12-14 12:12:36 +01:00 |
|
Adam Warner
|
6bfe729112
|
Merge pull request #979 from pi-hole/wwwdatapassword
Prevent web UI password change by web user
|
2016-12-13 16:33:41 +00:00 |
|
DL6ER
|
c340668870
|
Merge pull request #976 from pi-hole/websettingspage
Add necessary backend for the new "Settings" page of the web UI
|
2016-12-13 17:32:18 +01:00 |
|
DL6ER
|
207422f83a
|
Added a missing space
|
2016-12-13 15:54:41 +01:00 |
|
DL6ER
|
004ba28378
|
Prevent web UI password change by web user
|
2016-12-13 15:52:28 +01:00 |
|
DL6ER
|
6f38801ed8
|
Add "Interface appearence" option
|
2016-12-13 14:59:52 +01:00 |
|
Adam Warner
|
1509eb7d82
|
Merge pull request #978 from pi-hole/Mcat12-adzhosts-list
Update ADZHOSTS list
|
2016-12-13 12:13:37 +00:00 |
|
DL6ER
|
b8d2bfc890
|
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
|
2016-12-13 12:42:40 +01:00 |
|
Mcat12
|
8a2ee95e4a
|
Update ADZHOSTS list
|
2016-12-12 15:30:47 -05:00 |
|
DL6ER
|
bc91716082
|
Suppress logging of DHCP actions to /var/log/pihole.log
|
2016-12-12 17:14:52 +01:00 |
|
DL6ER
|
a00034a6a7
|
Add password to webUI after update if there is none
|
2016-12-12 17:03:53 +01:00 |
|