WaLLy3K
f875976268
Replacing superseded file with dummy content
2017-05-11 21:02:04 +10:00
WaLLy3K
1c2aa44d46
Provide notice message for whitelisted sites
2017-05-11 20:10:40 +10:00
WaLLy3K
3b44a0da32
Provide error message if not found in any list
2017-05-11 20:09:00 +10:00
WaLLy3K
173ad339bb
Update CSS location
2017-05-08 19:33:45 +10:00
WaLLy3K
4d731ca30b
Updated landing page location
...
During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!
2017-05-03 15:33:50 +10:00
WaLLy3K
f2016f26d7
Updated splash page CSS href
2017-05-03 15:29:43 +10:00
WaLLy3K
a8818c16d8
Fixed unnecessary usage of !important
2017-05-02 19:51:13 +10:00
WaLLy3K
dfb5c37d98
Delete index.js
2017-05-02 17:21:40 +10:00
WaLLy3K
551add5f44
Update index.php
...
* An "About Pi-hole" link on the block page provides an ELI5 explanation to those not familiar with Pi-hole
* An email contact link on the block page provides users of your Pi-hole with a means to easily get in touch with you
* Browsing to your Pi-hole's address will show a simple "landing page", which can be replaced by adding "landing.php" within "/var/www/html"
* Users manually browsing to file/image based content (i.e: non HTML based content) on blocked sites will be greeted with a small "Blocked by Pi-hole" image
* Sites that are manually blacklisted will display a notice of this on the block page
* Sites that aren't directly blocked, but have a CNAME record, will show a notification on the block page (e.g: If raw.githubusercontent.com is not blocked, but github.map.fastly.net is)
* On the block page, "Back to Safety" now directs the user to "about:home" if Javascript is disabled
* Whitelisting is disabled for installs without a password, or if a client does not have Javascript
* Known issues:
* Admin Console needs a text field under "Web User Interface" where the admin can enter a preferred contact email when a site needs to be whitelisted, to be saved to setupVars.conf with the key "ADMIN_EMAIL"
* Admin Console needs a text field under "Networking" where the admin can enter their Pi-hole's externally contactable FQDN, allowing access to their landing page when browsing to mypi.duckdns.org, to be saved to setupVars.conf with the key "FQDN"
* I am not aware of expected output of `$_SERVER["VIRTUAL_HOST"]`, so I have assumed it should be filtered as if it's a domain
2017-05-02 17:06:31 +10:00
WaLLy3K
88944a31ec
Update blockingpage.css
...
* Block page UI overhaul to replicate the style of the Admin Console
* Block page UI is now mobile friendly
* Users can safely customise text in order to make the block page more friendly for their household
2017-05-02 17:05:24 +10:00
Dan Schaper
8c657910ae
Merge pull request #1280 from technicalpyro/development
...
fixes missing dialog package from some distros
2017-05-01 16:07:32 -07:00
Dan Schaper
1886c44579
Merge pull request #1406 from pi-hole/update/UA
...
Update default User Agent to modern browser.
2017-05-01 14:35:55 -07:00
Dan Schaper
6a2b885988
Update default User Agent to modern browser.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-04-27 11:41:08 -07:00
Dan Schaper
bfc4775b34
Merge pull request #1297 from raincoats/development
...
Redirect to admin panel when accessing 'http://pi.hole/ '
2017-04-26 12:35:19 -07:00
Adam Warner
981004606b
Merge branch 'master' into development
2017-04-26 20:12:34 +01:00
Adam Warner
9d40fd1eda
Merge branch 'development' Resolved conflicts
...
# Conflicts:
# advanced/Scripts/piholeCheckout.sh
2017-04-26 20:12:16 +01:00
DL6ER
fbb6b56d99
Merge pull request #1397 from pi-hole/fix/ipv4ipv6error
...
Bugfix: Blocking page
2017-04-20 16:18:50 +02:00
DL6ER
f1f70133dc
Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396
2017-04-20 13:53:27 +02:00
DL6ER
d0f55e5125
Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files
...
Delete the temp files created by gravity
2017-04-19 08:46:01 +02:00
Mcat12
5e308dbd51
Delete the temp files created by gravity
2017-04-18 20:35:06 -04:00
Mcat12
c3c554f4d6
Merge pull request #1391 from pi-hole/tweak/flush
...
Flush twice to move data out-of-sight of FTL
2017-04-17 20:10:03 -04:00
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02:00
DL6ER
b1484104bd
Merge pull request #1379 from pi-hole/tweak/FTLinit.d
...
Tweaks for `FTL`'s init file
2017-04-13 12:53:37 +02:00
Mcat12
c738a9a044
Merge pull request #1381 from technicalpyro/development
...
Grammar Fix
2017-04-12 21:29:39 -04:00
Technicalpyro
519cb71022
Grammar Fix
...
]
2017-04-12 16:05:21 -04:00
DL6ER
fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running
2017-04-12 15:12:09 +02:00
DL6ER
3eacfa9831
Improve FTL's service script
2017-04-12 14:13:18 +02:00
Mcat12
1d64b614c7
Merge pull request #1349 from pi-hole/internal/editorconfig
...
Add .editorconfig
2017-04-06 18:05:56 -04:00
Dan Schaper
a832dd7f67
Update .editorconfig
...
Set path for JS source.
2017-04-06 14:55:21 -07:00
Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
Mcat12
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
Patrick O'Brien
263eb856d5
remove vagrant from gitignore
2017-04-03 15:15:44 -04:00
DL6ER
5a4f088b24
Merge pull request #1341 from pi-hole/tweak/readme-tm
...
Update logo and Pi-hole™ name with a trademark symbol.
2017-04-03 17:35:58 +02:00
DL6ER
c1913bfa7d
Merge pull request #1366 from pi-hole/fix/adaway-list-agent
...
Use correct agent when downloading adaway.org list
2017-04-03 17:32:44 +02:00
DL6ER
474881e4c7
Merge pull request #1346 from pi-hole/varChanges
...
Clean up previous PR
2017-04-03 17:32:02 +02:00
Flo
7e0aa822b6
Match the Pi-hole brand ( #1358 )
...
* Update README.md
* Update index.php
* Update basic-install.sh
* Update piholeCheckout.sh
* Update update.sh
* Update CONTRIBUTING.md
* Update the Pi-hole brand tip in CONTRIBUTING.md
Use a better formulation.
* Update README.md 2
2017-04-03 17:29:57 +02:00
DL6ER
940d780a4c
Merge pull request #1361 from pi-hole/new/error404page
...
Improve Error 404 page behavior
2017-04-03 17:25:46 +02:00
DL6ER
ad9575ce18
Recognize more host names
2017-04-03 16:28:18 +02:00
Mcat12
ce86205df0
Use correct agent when downloading adaway.org list
...
See https://discourse.pi-hole.net/t/2278
2017-04-02 12:44:00 -04:00
Adam Warner
3cf9942465
spacing fixed
2017-03-31 23:00:56 +01:00
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this
2017-03-31 22:51:10 +01:00
Adam Warner
1f74b1e2fd
newline
2017-03-31 21:12:17 +01:00
Adam Warner
42393123a0
add newline to adlists.default
2017-03-31 20:15:13 +01:00
Adam Warner
af2cff5177
remove call to user list
2017-03-31 20:13:04 +01:00
Adam Warner
5435b93df2
remove spaces
2017-03-31 20:05:45 +01:00
Adam Warner
3a3dde6298
add adlist argument redirector
2017-03-31 20:03:56 +01:00
Adam Warner
b4bc90fb85
add in CustomizeAdlists function
2017-03-31 19:35:52 +01:00
Adam Warner
02040cd25d
We no longer need to do this, either
2017-03-31 19:23:26 +01:00
Adam Warner
bdc6bd4135
Don't need this comment anymore
2017-03-31 19:18:28 +01:00
Adam Warner
e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
2017-03-31 19:16:09 +01:00
