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 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
3288 commits 8 branches 109 tags 27 MiB
Commit graph

3288 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ryan Knapper
f2b3752f3d
lan to local 
Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:08:55 -05:00
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list 
Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:04:10 -05: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
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-16 22:10:27 +01:00
Dan Schaper
fb9cdea008
Merge pull request #1914 from deathbybandaid/development 
Update README.md
 2018-01-15 11:08:43 -08:00
Adam Warner
6c54bf036c
Merge pull request #1913 from pi-hole/tweak/GravityFunctionNames 
proposed gravity function renames
 2018-01-15 17:51:19 +00:00
Deathbybandaid
657bc4edcd
Update README.md 
Signed-off-by: deathbybandaid
 2018-01-15 08:05:43 -05:00
Deathbybandaid
b75dd5ff73
needed sign-off 
Signed-off-by:
 2018-01-15 08:04:27 -05:00
ryanknapper
607664c860
Update webpage.sh 
Updated webpage.sh to include conditional forwarding options.
 2018-01-14 21:01:08 -05:00
Deathbybandaid
094bd49f35
Update README.md 2018-01-14 20:29:20 -05:00
Adam Warner
18fbe60381
Merge pull request #1908 from pi-hole/tweak/RemoveCronPiholeUpdate 
If this line is uncommented, it is re-commented on the next update an…
 2018-01-14 20:58:58 +00:00
Adam Warner
f1956119fb
proposed gravity function renames 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-14 20:38:39 +00:00
Adam Warner
876170767c
Print actual domain instead of grep output of "Binary file /etc/pihole/list.preEventHorizon matches" when a domain with a unicode char is in a source list. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-13 16:43:20 +00:00
Dan Schaper
f4f77ec88b
Merge pull request #1900 from roots84/patch-1 
Update README.md
 2018-01-13 05:03:29 -08:00
Stefan
9ba2038702 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@noreply.users.github.com>
 2018-01-12 21:25:09 +01:00
Stefan
b176ba9e80 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@noreply.users.github.com>
 2018-01-12 21:24:39 +01:00
Stefan
cacb47ca7e Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@noreply.users.github.com>
 2018-01-12 21:23:36 +01:00
Stefan
500e424fee Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@noreply.users.github.com>
 2018-01-12 21:22:43 +01:00
Stefan
f1b02c0cab Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 2018-01-12 21:21:26 +01:00
Stefan
828302702b Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@users.noreply.github.com>
 2018-01-12 21:20:39 +01:00
Stefan
0827d4fe40 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 2018-01-12 21:18:30 +01:00
Stefan
ebff965414 Update README.md 
Adding DNS-Swapper Project back after it was accidently removed

Signed-off-by: roots84 <stefan.bautz@gmail.com>
 2018-01-12 21:17:10 +01:00
Dan Schaper
b45954c560
Merge pull request #1895 from pi-hole/feature/PR_templateDCO 
Update PULL_REQUEST_TEMPLATE.md
 2018-01-12 08:14:51 -08:00
Adam Warner
80307a3bcd
Remove update line from cron 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-12 15:43:15 +00:00
Adam Warner
e8acb5967b
Merge pull request #1904 from vgerak/patch-1 
piholeDebug.sh: Correct typo mistake
 2018-01-12 15:04:27 +00:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake 
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
 2018-01-12 02:17:31 +02:00