Adam Warner
|
aed20cf7c6
|
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
Gravity falls over when there is no whitelist file
|
2018-03-06 20:39:32 +00:00 |
|
Adam Warner
|
ad1f210528
|
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-03-06 18:29:28 +00:00 |
|
Mark Drobnak
|
e3e5e016d5
|
Merge pull request #2016 from pi-hole/bugfix/mktemp
Bugfix mktmp > mktemp
|
2018-03-02 16:03:11 -05:00 |
|
Dan Schaper
|
3425b9a82e
|
Fix mktmp > mktemp
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-03-02 12:28:53 -08:00 |
|
Dan Schaper
|
6011dd7372
|
Merge pull request #2000 from pi-hole/fix/FTL_Install
Use pushd/popd and create random temporary directory
|
2018-02-26 21:55:12 -08:00 |
|
Dan Schaper
|
41d9d57c84
|
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
Specifty `LC_ALL=C` when dealing with sorted lists.
|
2018-02-24 07:22:44 -08:00 |
|
Dan Schaper
|
4606693e62
|
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-02-22 20:13:38 -08:00 |
|
Adam Warner
|
6b4685b333
|
much more elegant to export LC_ALL at the beginning of the script!
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-02-21 11:33:29 +00:00 |
|
Adam Warner
|
d4ac818a0b
|
Specifty LC_ALL=C when dealing with sorted lists.
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-02-21 11:23:07 +00:00 |
|
Mark Drobnak
|
f14184df30
|
Merge pull request #1982 from LudovicRousseau/master
Create blacklist.txt if not existant
|
2018-02-18 15:32:01 -05:00 |
|
Ludovic Rousseau
|
47bbea9ba7
|
Use " " to protect parameter substitution
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
2018-02-18 21:20:04 +01:00 |
|
Mark Drobnak
|
7265935cd4
|
Merge pull request #1915 from ryanknapper/development
Add conditional forwarding options to webpage.sh
|
2018-02-18 12:51:46 -05:00 |
|
DL6ER
|
40bda4b3d1
|
Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service
Always replace pihole-FTL.service
|
2018-02-18 17:26:17 +01:00 |
|
Ludovic Rousseau
|
b7891f92a5
|
Create blacklist.txt if not existant
Closes: https://github.com/pi-hole/pi-hole/issues/1888
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
2018-02-18 14:19:49 +01:00 |
|
DL6ER
|
8b79017d0f
|
Always replace pihole-FTL.service
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-02-18 13:07:22 +01:00 |
|
DL6ER
|
5465ac9ba0
|
Merge pull request #1929 from pi-hole/fix/flushDB
pihole -f: Flush database
|
2018-02-17 17:45:15 +01:00 |
|
DL6ER
|
b8eaa9a527
|
Use double quotes to precent globbing and word splitting
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-02-17 13:01:00 +01:00 |
|
DL6ER
|
5d274008db
|
Use possibly user-defined database location when flushing
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-02-17 12:58:57 +01:00 |
|
DL6ER
|
220e755596
|
Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting
Don't auto-whitelist blocking list domains
|
2018-02-17 12:23:14 +01:00 |
|
DL6ER
|
fc5034696d
|
Don't auto-whitelist blocking list domains
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-02-16 19:42:33 +01:00 |
|
DL6ER
|
4a6f77bc59
|
Merge pull request #1967 from pi-hole/master
Git flow Pi-hole v3.3
|
2018-02-15 21:09:22 +01:00 |
|
Dan Schaper
|
1e87850952
|
Merge pull request #1943 from pi-hole/release/3.3
Pi-hole v3.3
|
2018-02-14 12:48:40 -08:00 |
|
Mark Drobnak
|
3472241289
|
Merge pull request #1962 from floek/master
Fixes https://github.com/pi-hole/pi-hole/issues/1772
|
2018-02-14 13:02:56 -05:00 |
|
Florian Freund
|
a944b6ff79
|
Fixes https://github.com/pi-hole/pi-hole/issues/1772
|
2018-02-12 21:28:43 +01:00 |
|
Mark Drobnak
|
6c4741bc61
|
Merge pull request #1730 from pi-hole/tweak/block-page-no-password
Disable password field on block page if no password is set
|
2018-02-11 22:15:20 -05:00 |
|
Mcat12
|
8a42ef431b
|
Fix Javascript warning when no password is set
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-02-11 21:49:12 -05:00 |
|
Mcat12
|
2cf1f0e8fc
|
Hide the password input when there is no password
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-02-11 14:07:02 -05:00 |
|
Mcat12
|
55e50eced6
|
Merge branch 'development' into tweak/block-page-no-password
|
2018-02-11 13:49:36 -05:00 |
|
Adam Warner
|
30a2923380
|
Merge pull request #1952 from smopucilowski/fixes
Trivial spelling mistakes in basic-install.sh comments
|
2018-02-11 10:43:33 +00:00 |
|
Sebastian Pucilowski
|
c5a2ca5c98
|
Trivial spelling mistakes in basic-install.sh comments
Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>
|
2018-02-07 16:56:21 +11:00 |
|
Dan Schaper
|
9f2ce0e296
|
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity
Potential fix for #1909
|
2018-01-28 03:23:19 -08:00 |
|
Adam Warner
|
55e10d8287
|
replace another grep -F as pointed out by @StarPicard
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-01-28 00:50:15 +00:00 |
|
Dan Schaper
|
94c772e1a8
|
Merge pull request #1936 from theel0ja/patch-fix-typo
Fixed a typo
|
2018-01-27 04:45:53 -08:00 |
|
Elias Ojala
|
2b6d9c34c9
|
Fixed a typo
Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>
|
2018-01-27 14:36:11 +02:00 |
|
Mcat12
|
1a5c86d32e
|
Revert "Hide password textbox if there is no password"
This reverts commit 009fa2f1b7.
|
2018-01-23 20:28:43 -05:00 |
|
Mcat12
|
c7219fbdff
|
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password
|
2018-01-21 09:09:36 -05:00 |
|
DL6ER
|
4c249a1186
|
Flush most recent 24 hours from FTL's database
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-01-21 13:48:13 +01:00 |
|
DL6ER
|
158ea1d43b
|
Add sqlite3 dependency
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-01-21 11:54:49 +01:00 |
|
Mark Drobnak
|
535b8458d4
|
Merge pull request #1901 from bcambl/epel_check
Fix epel-release install for CentOS
|
2018-01-20 14:03:24 -05:00 |
|
Dan Schaper
|
49b3f82675
|
Merge pull request #1925 from pi-hole/feature/installtweaks
Install log security
|
2018-01-20 08:59:49 -08:00 |
|
Dan Schaper
|
9543203610
|
Echo the right location for the log.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-20 08:45:41 -08:00 |
|
Dan Schaper
|
cacfe4d387
|
Linting changes
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-20 07:39:11 -08:00 |
|
Dan Schaper
|
a7f0137e5f
|
Use more secure installation log process.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-20 05:55:48 -08:00 |
|
Dan Schaper
|
b2eb364a4b
|
Update header
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-20 05:36:28 -08:00 |
|
Dan Schaper
|
bb3b1bc6ba
|
Move ascii berry to after root check, stops the double berry for the sudo refire.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-20 05:13:55 -08:00 |
|
Dan Schaper
|
ae8eb3f177
|
Merge pull request #1920 from pi-hole/feature/pr_template
Internal - GitHub template edit.
|
2018-01-20 03:48:51 -08:00 |
|
DL6ER
|
27c7325174
|
Merge pull request #1918 from pi-hole/tweak/lan
Use "lan" as fallback TLD for DHCP generated domains
|
2018-01-20 10:29:11 +01:00 |
|
DL6ER
|
8ee3d810b0
|
Merge pull request #1922 from pi-hole/tweak/logging-noflush
Add "pihole logging off noflush" command
|
2018-01-20 10:21:23 +01:00 |
|
DL6ER
|
d7dde06552
|
Add "pihole logging off noflush" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-01-18 17:08:46 +01:00 |
|
Dan Schaper
|
448495a4a3
|
Remove references to issues.
Modify code blocks to italics and reformat the layout.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-01-16 14:56:15 -08:00 |
|