From 901fc6392a4ddd4b99095edfc79aa9f00b3d104e Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 26 Mar 2017 14:46:57 +0200 Subject: [PATCH 1/5] Update help.php --- help.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/help.php b/help.php index ccfda427..c1c0fd56 100644 --- a/help.php +++ b/help.php @@ -77,7 +77,7 @@

Disable / Enable

- Disables/enables Pi-Hole blocking completely. You may have to wait a few minutes for the changes to reach all of your devices. The change will be reflected by a changed status (top left) + Disables/enables Pi-hole blocking completely. You may have to wait a few minutes for the changes to reach all of your devices. The change will be reflected by a changed status (top left)
@@ -101,11 +101,11 @@

Settings

- Change settings for the Pi-Hole + Change settings for the Pi-hole

Networking

- Displays information about the interfaces of the Pi-Hole. No changes possible. -

Pi-Hole DHCP Server

- Using this setting you can enable/disable the DHCP server of the Pi-Hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled. + Displays information about the interfaces of the Pi-hole. No changes possible. +

Pi-hole DHCP Server

+ Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled.

Upstream DNS Servers

Customize used upstream DNS servers + advanced settings for DNS servers. Note that any number of DNS servers may be enabled at a time.

Query Logging

From f9151c1e9b07c60fe8e315bc4136ecab4da50b14 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 26 Mar 2017 14:50:01 +0200 Subject: [PATCH 2/5] Update settings.php --- settings.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/settings.php b/settings.php index a71ad9fd..29b0f91b 100644 --- a/settings.php +++ b/settings.php @@ -94,21 +94,21 @@
- +
- +
- +
@@ -116,7 +116,7 @@

Warning: PHP has been compiled without IPv6 support.

- +
@@ -125,7 +125,7 @@
-

Pi-Hole DHCP Server

+

Pi-hole DHCP Server

@@ -243,7 +243,7 @@
- +
Domain
@@ -562,7 +562,7 @@
-

Note that enabling these two options may increase your privacy slightly, but may also prevent you from being able to access local hostnames if the Pi-Hole is not used as DHCP server

+

Note that enabling these two options may increase your privacy slightly, but may also prevent you from being able to access local hostnames if the Pi-hole is not used as DHCP server

From 61870cf3426e6ca1bcea32b57e7c29d4f3070cb8 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 26 Mar 2017 14:55:40 +0200 Subject: [PATCH 3/5] Update loginpage.php --- scripts/pi-hole/php/loginpage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php index 393bf1db..560c934d 100644 --- a/scripts/pi-hole/php/loginpage.php +++ b/scripts/pi-hole/php/loginpage.php @@ -53,7 +53,7 @@
- After installing Pi-Hole for the first time, a password is generated and displayed to the user. The + After installing Pi-hole for the first time, a password is generated and displayed to the user. The password cannot be retrieved later on, but it is possible to set a new password (or explicitly disable the password by setting an empty password) using the command 
sudo pihole -a -p newpassword
From 146184824fb75c1c8eaca19f3a5d5f41d24958e9 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 26 Mar 2017 14:56:21 +0200 Subject: [PATCH 4/5] Update savesettings.php --- scripts/pi-hole/php/savesettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index 13c60862..5c759c6d 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -400,7 +400,7 @@ function isinserverlist($addr) { case "flushlogs": exec("sudo pihole -f"); - $success = "The Pi-Hole log file has been flushed"; + $success = "The Pi-hole log file has been flushed"; break; case "DHCP": From 99e51ef2f0aa665eb937861a5ba3ffe030de3dfd Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 26 Mar 2017 17:04:44 +0200 Subject: [PATCH 5/5] Add the Pi-hole brand to the CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64e702f8..bfb67b77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,3 +7,4 @@ This is a basic checklist for now, We will update it in the future. * Submit Pull Requests to the development branch only. * Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!) * Be patient. We will review all submitted pull requests, but our focus is on stability.. please don't be offended if we reject your PR, or it appears we're doing nothing with it! We'll get around to it.. +* Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)