Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
4542 commits 10 branches 109 tags 28 MiB
Commit graph

4542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Warner
6104d81622
Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-24 20:36:45 +00:00
Adam Warner
121c93e822
Merge pull request #3160 from pi-hole/release/v4.3.5 
Hotfix 4.3.5
 2020-02-24 20:16:54 +00:00
Adam Warner
b4c2bf678f
Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-24 20:02:48 +00:00
Adam Warner
14944b0283
Merge pull request #3157 from pi-hole/release/v4.3.4 
Release v4.3.4
 2020-02-24 18:48:03 +00:00
Adam Warner
8ecaaba247
Compare daemons to expected results. (#3158) (#3159) 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Co-authored-by: Dan Schaper <dan@glacialmagma.com>
 2020-02-24 18:00:19 +00:00
Dan Schaper
0fbcc6d8b5
Compare daemons to expected results. (#3158) 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-02-24 17:38:37 +00:00
Adam Warner
707e21b927
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-24 12:10:36 +00:00
DL6ER
f4a1cc6dec
Merge pull request #3150 from pi-hole/tweak/database_warnings_inspection 
Gravity: Check suitablility of sourced lists
 2020-02-24 10:18:00 +01:00
DL6ER
3dd05606ca
Call it the received number of domains instead of the imported number as importing does only happen a bit later. Only show the number of invalid domains if there are invalid domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-24 07:06:15 +01:00
DL6ER
1e8bfd33f5
Improve output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-23 22:50:06 +01:00
Adam Warner
545b6605bc
4.3.3 (#3154) 
* Backport ee7090b8fc to v4 to prevent failures in FTL download
* update tests to reflect changes to FTL download URL
* backport `tbd` fix

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-23 21:34:12 +00:00
DL6ER
8131b5961c
Add comments to the code describing the changes. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-22 15:22:29 +01:00
DL6ER
81d4531e10
Implement performant list checking routine. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-22 13:01:55 +01:00
DL6ER
050e2963c7
Remove redundant code. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-21 22:28:53 +01:00
DL6ER
3c09cd4a3a
Experimental output of matching line from shown warnings. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-21 21:47:56 +01:00
DL6ER
839fe32042
Fix issue with missing newline at the end of adlists (#3144) 
* Also display non-fatal warnings during the database importing. Previously, we have only show warnings when there were also errors (errors are always fatal).

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Ensure there is always a newline on the last line.

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Stickler linting

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

* Move sed command into subroutine to avoid code duplication.

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Also unify comments.

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Also unify comments.

Signed-off-by: DL6ER <dl6er@dl6er.de>

Co-authored-by: Dan Schaper <dan@glacialmagma.com>
 2020-02-21 18:56:48 +00:00
Adam Warner
85c15a7167
Merge pull request #3147 from pi-hole/tweak/forcelocalversions 
force `updatchecker.sh` run if any of the three components are updated
 2020-02-20 18:57:56 +00:00
DL6ER
b73580fa93
Merge pull request #3132 from pi-hole/fix/pihole-tail 
Fix pihole -t sed instructions
 2020-02-19 19:07:38 +01:00
Adam Warner
4a5f344b09
then 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-19 17:46:45 +00:00
Adam Warner
af95e8c250
force updatchecker.sh run if any of the three components are updated 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-19 17:41:53 +00:00
Adam Warner
ee7090b8fc
Merge pull request #3140 from pi-hole/tweak/whocaresaboutthelatesttaganyway 
No need to determine the latest tag, we can just go direct.
 2020-02-17 21:39:48 +00:00
Adam Warner
7be019ff52
No need to determine the latest tag, we can just go direct 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-17 21:29:25 +00:00
DL6ER
d14ee26d6a
Merge pull request #3139 from pi-hole/fix/count_before_calling_FTL 
Fix wrong number of blocking domains shown on the dashboard
 2020-02-17 21:32:45 +01:00
DL6ER
52398052e9
Compute number of domains (and store it in the database) BEFORE calling FTL to re-read said value. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-17 21:07:48 +01:00
DL6ER
ddbd57f459
Merge pull request #3131 from pi-hole/tweak/debugger_performance 
Tweaks and fixes for the debugger
 2020-02-17 06:23:20 +01:00
DL6ER
601f9048cd
Merge pull request #3130 from pi-hole/fix/gravity_updated_timestamp 
Store gravity update timestamp only after database swapping
 2020-02-17 06:07:05 +01:00
Dan Schaper
c5c414a7a2
Stickler Lint - quote to prevent splitting 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-02-16 19:24:05 -08:00
Dan Schaper
bc91be6c08 Merge branch 'tweak/debugger_performance' of https://github.com/pi-hole/pi-hole into tweak/debugger_performance 2020-02-16 17:44:16 -08:00
DL6ER
d0e29ab7b0 Add human-readable output of time of the last gravity run. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
714a79ffce Migrate debugger to domainlist and add printing of client table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
cd3ad0bdc7 Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
a8db753493
Merge pull request #3138 from pi-hole/fix/php-intl 
Install php-intl meta package.
 2020-02-16 21:51:14 +01:00
DL6ER
75633f0950
Install php-intl and trust the system to install the right extension. We've seen reports that just installing php5-intl or php7-intl isn't sufficient and that we need the meta package as well. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 21:24:32 +01:00
Adam Warner
082cfb2f1c
Merge pull request #3137 from pi-hole/tweak/apilatest 
Change to use API instead of the Location Header
 2020-02-16 12:19:31 +00:00
Adam Warner
1072078e26
Change to use API instead of the Location Header 
(some trailing whitespace removed)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-16 11:47:42 +00:00
pvogt09
b0f1333657 Move permission change behind git reset (like in update_repo()) and remove whitespace at end of line 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-02-14 20:43:36 +01:00
DL6ER
f10a151469
Fix pihole -t sed instructions. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 21:05:02 +01:00
DL6ER
eadd82761c
Add human-readable output of time of the last gravity run. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 19:51:40 +01:00
DL6ER
00f4393f48
Merge branch 'release/v5.0' into tweak/debugger_performance 2020-02-12 19:44:56 +01:00
DL6ER
50f6fffbdc
Migrate debugger to domainlist and add printing of client table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 19:43:55 +01:00
DL6ER
baf5340dc0
Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 19:39:12 +01:00
DL6ER
e528903488
Merge pull request #3107 from pi-hole/new/client_comments 
Add timestamps and comment fields to clients table
 2020-02-12 19:35:01 +01:00
DL6ER
dc2fce8e1d
Store gravity update timestamp only after database swapping. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 19:26:25 +01:00
Dan Schaper
c4005c4a31
Delete FUNDING.yml 
Organization-wide FUNDING now set up.
 2020-02-11 09:56:28 -08:00
Adam Warner
0a70bbd255
Merge pull request #3120 from canihavesomecoffee/patch-1 
Update Cameleon blacklist url to use https
 2020-02-08 17:25:49 +00:00
Willem
c91d9cc0b6 Update Cameleon blacklist url to use https 
Switches from http to https for the Cameleon (sysctl.org) blacklist.

Signed-off-by: canihavesomecoffee <canihavesomecoffee@users.noreply.github.com>
 2020-02-08 17:06:03 +01:00
DL6ER
8e10c22356
Merge pull request #3106 from pi-hole/fix/group_assignments 
DROP and reCREATE TRIGGERs during gravity swapping.
 2020-02-07 17:40:34 +01:00
DL6ER
37a44c0773
Merge pull request #3115 from pi-hole/tweak/gravity_count 
Store number of distinct gravity domains in database after counting
 2020-02-05 23:25:36 +01:00
DL6ER
2a5cf221fa
Store number of distinct gravity domains in database after counting. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-02 23:46:33 +01:00
DL6ER
92aa510bda
Add timestamps and comment fields to clients. This updates the gravity database to version 11. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-27 10:36:16 +00:00