Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
2421 commits 8 branches 109 tags 27 MiB
Commit graph

2421 commits

This branch
This branch
All branches
Author SHA1 Message Date
WaLLy3K
3bd677c102 Show help for "pihole -v -h" 
* Indent output text
* Minor help text change
 2017-05-14 11:57:46 +10:00
WaLLy3K
4eb7d2868c Fix "pihole disable --help" and "pihole -l --help" 2017-05-14 11:53:40 +10:00
WaLLy3K
0e4473685b Show help for "pihole -a -i --help" 2017-05-14 11:47:56 +10:00
WaLLy3K
b721ed49ab Update Help Output (#1467) 
* File consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals

* Standardise core help text

* Added help text for disable command
* Added help text for logging command

* Clean up

* Fixed certain new lines and spaces

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Admin help text

* Added help text for interface command

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces

* Formatting consistency

* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Blacklist help text

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting

* Cronometer help text

* Formatting consistency

* Fixed certain newlines and spaces
* Corrected indenting

* Checkout warning alteration

* Add checkout help text

* Corrected help output
 2017-05-14 11:11:44 +10:00
Adam Warner
26fcb1b2a0 Merge pull request #1429 from pi-hole/development 
Release v3.0.1
 2017-05-04 15:12:26 +01:00
DL6ER
e9c4e8123c Merge branch 'master' into development 2017-05-04 12:12:44 +02:00
Dan Schaper
a290e01bdf Merge pull request #1421 from pi-hole/fix/accidental-password-reset 
Add option to enter new password as command arg
 2017-05-04 03:11:54 -07:00
DL6ER
9cc392fa02
Update Marks PR after the Promo code has been merged 2017-05-04 11:43:48 +02:00
Dan Schaper
7c2046cce7 Merge pull request #1423 from pi-hole/promoLearnsToCode 
Double hash the password directly in the install script
 2017-05-03 12:07:38 -07:00
Adam Warner
b13171cc45
$1 is not $pw. Seriously, who let me onto this project 2017-05-02 22:37:38 +01:00
Adam Warner
9c645e2010
Seriously. 2017-05-02 22:30:02 +01:00
Adam Warner
bb6f409e89
dropped a " 2017-05-02 22:28:32 +01:00
Adam Warner
61ec7723f6
use function in install script 2017-05-02 22:25:47 +01:00
Adam Warner
9c136a5579
functionise Hashing 2017-05-02 22:24:37 +01:00
Adam Warner
a5733508ae
Double hash the password directly in the install script 2017-05-02 21:36:08 +01:00
DL6ER
c8e1e6dc8a Merge pull request #1418 from pi-hole/tweak/debug/FTL_log 
Include pihole-FTL.log in debug report
 2017-05-02 09:41:35 +02:00
DL6ER
30dcf6ff47
Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
DL6ER
3473ebc0fe Merge pull request #1408 from pi-hole/tweak/localise-queries 
Add localise-queries flag to dnsmasq's config
 2017-05-02 08:56:47 +02: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
Adam Warner
1dcc1871fb Merge pull request #1404 from pi-hole/development 
3.0
 2017-05-01 22:03:54 +01:00
DL6ER
19e688effb
Add localise-queries flag to 01-pihole.conf 2017-04-30 13:47:07 +02: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