d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-21 22:25:00 +01:00
b2ba55c27b
Show details of any remotes on the git repositories
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-21 21:23:26 +01:00
b421e422c2
Merge pull request #3351 from marank/development
...
Added support for CNAME record add/remove
2020-05-20 09:13:54 +02:00
10addc5923
Merge pull request #3218 from JulienOrain/patch-1
...
fix typo
2020-05-14 09:48:59 -07:00
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation
...
Fix GitHub capitalisation
2020-05-13 16:56:36 -07:00
ab753e88a2
Fix GitHub capitalisation
...
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
2020-05-13 12:55:00 +02:00
be25b4d9c4
Merge pull request #3352 from pi-hole/merge-master-dev
...
Merge master dev
2020-05-12 22:27:24 +01:00
9e96ff37de
Fix merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-12 22:16:43 +01:00
a9c66c7b45
Implement pihole -a theme option
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 23:03:49 +02:00
2b9898e9ca
Fixed indentation
...
Signed-off-by: Matthias Rank <development@m-rank.de>
2020-05-12 21:04:30 +02:00
0add5eb291
Added support for CNAME record add/remvoe
...
Signed-off-by: Matthias Rank <development@m-rank.de>
2020-05-12 21:02:29 +02:00
7cc35d3b04
Add update to gravity database version 12, renaming the Unassociated group to Default group.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-07 18:01:37 +02:00
78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex
...
Enhanced email validation regex
2020-05-06 09:48:26 +02:00
369288cc48
Update advanced/Scripts/webpage.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2020-05-06 08:40:54 +01:00
742d802940
Merge pull request #3027 from XhmikosR/patch-1
...
Serve JS files with utf-8 charset too
2020-05-05 12:29:27 -07:00
017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display
...
Improve debugger database table printing
2020-04-29 11:48:47 -07:00
ddb354f78b
Add enable indentation for the domainlist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-29 06:23:29 +02:00
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-24 10:33:46 +02:00
ad5802715e
enabled field: Center 0, right-align 1
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-23 15:16:48 +02:00
989bbad37e
Remove pihole -a hostrecord
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-23 13:20:15 +02:00
63f6c6a894
Add indentation for enabled and type fields
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-23 10:01:22 +02:00
d42785a3bf
Merge pull request #3271 from pi-hole/tweak/version
...
Add branch name to pihole -v
2020-04-21 16:07:27 +01:00
401c029dc4
Improve else condition of branch determination
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-21 16:08:32 +02:00
0343171703
Add correct displaying for detached HEAD state.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-21 08:54:28 +02:00
176fbaf83b
Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-21 08:51:17 +02:00
471006676c
Merge pull request #3227 from pi-hole/new/CLI_domain_comments
...
Add option --comment "whatever" for adding comments for new domains through the CLI interface.
2020-04-19 14:39:05 +01:00
3cc9ba4ee8
stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-18 12:57:06 +01:00
6dc85c3527
Don't display branch name if it is on master.
...
Prefer cached remote version over github API
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-18 12:51:04 +01:00
851947bbf2
Add branch name to version output
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-13 20:58:46 +01:00
308eb5eda5
Fixes broken blocking page and landing page when changing server port and/or hostname.
...
See issues #2195 and #2720 .
Signed-off-by: Matthias Schoettle <git@mattsch.com>
2020-04-10 12:29:01 -04:00
982c1b0059
Merge branch 'release/v5.0' into development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-08 12:02:53 +02:00
26f71e4dbe
accidentally a space
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-05 12:34:14 +01:00
b6ac1585ec
add regex attribution
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-05 12:29:45 +01:00
a9b19df4ec
expand email validation regex to catch more valid emails see comments on PR #3254
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-05 12:28:33 +01:00
2de5362adc
Sanitize email address in case of security issues ( #3254 )
...
* Sanitize email address in case of security issues
Signed-off-by: bash-c <aboultraman@gmail.com>
2020-04-05 10:20:35 +01:00
d1caad76d8
Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all".
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-01 17:19:32 +00:00
7d19ee1b25
validate blocklist URL before adding to the database ( #3237 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: DL6ER <dl6er@dl6er.de>
2020-03-31 21:48:10 +01:00
277179f150
Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-03-27 19:34:41 +01:00
15a9d662ac
Add option --comment "whatever" for adding comments for new domains through the CLI interface.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-03-27 08:45:04 +01:00
6d4844a0b3
docs(typo): fix typo
...
Signed-off-by: Julien Orain <julien.orain@gmail.com>
2020-03-18 21:41:54 +01:00
7b8611ced0
Assorted typo fixes. ( #3126 )
...
* Assorted typo fixes.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-08 16:53:14 -07:00
497bfd80a5
Update development from release/v5.0 ( #3200 )
...
* Use bash regex instead of awk.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Fix incorrect type description. (#3201 )
Signed-off-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-08 16:38:53 -07:00
22ce5c0d70
Fix incorrect type description. ( #3201 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-03-08 16:32:37 -07:00
bf4fada3b7
Don't quote inside backticks, use unquoted variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-02 09:52:06 -08:00
360d0e4e6b
Loop through array of lists.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-02 08:07:10 -08:00
4f390ce801
Use bash regex instead of awk.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-02 05:39:21 -08:00
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
4a5f344b09
then
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-19 17:46:45 +00:00
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
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
Adam Warner
DL6ER
Dan Schaper
Dave Nicolson
DL6ER
Matthias Rank
Dan Schaper
Matthias Schoettle
M4x
Julien Orain
XhmikosR