af8c926cef
Merge pull request #795 from pi-hole/release/v4.0
...
Release v4.0
2018-08-05 10:44:28 -07:00
c847144152
Merge pull request #802 from pi-hole/devel
...
Bring missing v4.0 changes into release branch
2018-08-03 23:28:58 -04:00
1e7e0dc0f9
Merge pull request #798 from pi-hole/fix/list-comments
...
Ignore commented lines in list files
2018-08-02 12:20:55 +02:00
210160c83e
Merge pull request #799 from pi-hole/tweak/wildcard-regex-format
...
Use simpler regex format for wildcards
2018-08-01 01:01:27 -07:00
57698ba45a
Fix permissive regex
...
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 22:17:25 -04:00
b7ad22c51e
Use simpler regex format for wildcards
...
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 21:35:27 -04:00
97023278b3
Ignore commented lines in list files
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2018-07-31 21:12:41 -04:00
16ee8908ba
Merge pull request #797 from pi-hole/fix/regex_url
...
Link to docs is 404. Add target landing page.
2018-07-29 19:31:19 -04:00
098a002270
Link to docs is 404. Add target landing page.
...
Add `/overview/` to URL.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 16:16:20 -07:00
d9610ff66c
Merge pull request #794 from pi-hole/fix/db-graph-interpolation
...
Fill in empty db graph data intervals with zero
2018-07-26 20:13:50 -04:00
058bcd88b0
Merge pull request #793 from pi-hole/fix/blocklist-wording
...
Update blocklist wording and help page
2018-07-26 20:13:17 -04:00
34f89a83e7
Fill in empty db graph data intervals with zero
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-22 12:26:45 -04:00
2188103b5c
Update blocklist wording and help page
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-22 11:57:16 -04:00
97967f6180
Merge pull request #788 from pi-hole/fix/query-log-memory
...
Always start with empty search field on Query Log page
2018-07-17 20:04:18 -04:00
921791da17
Merge pull request #787 from pi-hole/fix/client-tooltip
...
Fix clients over time tooltip height and "lag" issues
2018-07-16 21:52:05 +02:00
cca2f6fc69
Always start with empty search field on Query Log page
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-16 18:35:30 +02:00
dd77a6af58
Add missing semicolon
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 16:43:14 -04:00
846e3e4184
Fix lag by limiting rendering to every 50ms
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 15:04:38 -04:00
4542a68f2f
Fix y value of tooltip scaling incorrectly
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-15 15:04:07 -04:00
3d0d3a9230
Merge pull request #785 from pi-hole/tweak/teleporter/regex
...
Add regex support for Teleporter
2018-07-15 11:56:30 -04:00
7c9f09db0e
Directly write imported regex file to disk instead of useing bash callbacks
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-15 12:56:40 +02:00
3e4613caf0
Move function add_regex($regex) to func.php
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-15 12:48:46 +02:00
65d0c7a1d9
Also try to import legacy wildcard list if found in imported teleporter archive
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 22:25:17 +02:00
e67695d51a
Add files backed up from /etc/dnsmasq.d into a separate directory to tidy up the generated archive
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 15:46:22 +02:00
ed8dbfd10e
Show number of processed items when importing whitelist, blacklist, and regex filters
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 15:34:42 +02:00
50885d092a
Import regex.list if requested. Don't check validity of regex filters as they are not necessarily in valid domain format
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 15:33:52 +02:00
6dc8bf300c
Export regex.list
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-14 15:27:54 +02:00
a85515a0bf
Merge pull request #772 from pi-hole/new/regex-support
...
Use regex lists instead of wildcards for blocking
2018-07-14 06:12:54 -07:00
fbe9516cbe
Fix incorrect regex removal code
...
If you had these in the regex list:
- example\.com
- example
- ^example.*
And you removed "example", then the list would look like this:
- \.com
- ^.*
This behavior is fixed.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-08 16:27:38 -04:00
a1b351b9af
Merge pull request #783 from pi-hole/tweak/warn-privacy-level-logging
...
Warn if privacy level > 0 but query logging activated
2018-07-06 19:46:02 -04:00
25c4a0e314
Print a glowing warning when the user defines a privacy level > 0 but still has logging enabled (he can still do this, but we should tell them that the pihole.log file will still contain the full records)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-04 22:57:41 +02:00
c837894bb5
Add back missing < and fix typo
...
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com >
2018-07-01 12:03:30 -04:00
bd49d7f329
Merge pull request #780 from pi-hole/fix/dupeword
...
Remove duplicate of the word "queries" on the query log page
2018-07-01 16:44:58 +01:00
342a53ed99
Remove duplicate of the word "queries" on the query log page
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-07-01 13:10:38 +01:00
7c742a426f
Help: No need for a trailing ".*$" as this will match anything (so we can also just leave it off)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-07-01 12:58:46 +02:00
2759ec0da5
Add missing break statements
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-30 15:18:13 -04:00
dc5ab22ff5
Show link to Pi-hole's Regex documentation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-30 14:54:10 +02:00
e8b2cbe698
Tag regex filters as "regex" to avoid the domain validation (otherwise regex lines could not get removed). Also ensure that deleting the first wildcard/regex does not hide the first exact blocking domain (this bug has been in since the very beginning of wildcard blocking)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-30 14:42:52 +02:00
4566db2a7c
Use passed argument in new function add_regex()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-30 14:30:45 +02:00
ec0afceeed
Add new button to allow both regex filters and legacy wildcards (get automatically converted to regex format)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-30 14:19:03 +02:00
60ca5e06fa
Merge remote-tracking branch 'origin/devel' into new/regex-support
2018-06-29 23:49:28 -04:00
f1ea117eda
Update help page for regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-29 23:49:10 -04:00
4259aada78
Don't leave a newline at the end of the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-29 23:03:01 -04:00
aef5f7c7ce
Keep trailing newline in regex file after removal
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-28 23:16:11 -04:00
25ead792e4
Merge pull request #777 from pi-hole/tweak/db-summary-readability
...
Improve readability of long term summary stats
2018-06-28 22:32:09 -04:00
9bc09564ba
Improve readability of long term summary stats
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-25 19:44:22 -04:00
c0da231fa6
Force reload of the regex filters in FTLDNS after having added/removed one from the dashboard
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-24 12:42:05 +02:00
1935544183
Directly manipulate regex.list from PHP to avoid detour over bash. This needs read/write permissions of the PHP user on "/etc/pihole/regex.list" !
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-23 15:50:19 +02:00
3f7246968e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-17 20:01:46 +02:00
a0f9a1bdb8
JavaScript allows the omission of curly braces when a block contains only one statement. However, codacy wants us to never omit curly braces around blocks, even when they are optional. This code has not been introduced in this PR, so it's not entirely clear why it has been detected in this PR...
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-17 15:11:53 +02:00
Dan Schaper
Mark Drobnak
DL6ER
Mcat12
Dan Schaper
DL6ER
Adam Warner
Adam Warner