Commit Graph

2686 Commits

Author SHA1 Message Date
DL6ER 6fb2dab5bc Extend query log and API to be able to handle requests limited to specific forward destinations and query types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:36:37 +02:00
DL6ER 6f7e1b5b59 Open Query Log with filtering option on Query Type when left-clicking on an element in the pie-chart. The current behavior is moved to middle mouse click.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:33:02 +02:00
Mark Drobnak da2a6fec69 Merge pull request #817 from pi-hole/codeformatting
Changes to code formatting
2018-08-13 16:11:28 -04:00
Rob Gill 5dfe0eedef Standalone open curly brackets for if and for statements
For code consistency all opening curly brackets for if and for statements now stand alone on their own lines

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-08-11 09:26:58 +10:00
Rob Gill 32cd50b718 Changes to formatting only (no functional changes)
Issues identified by codacy

*Multiple spaces removed
*piholeChanged defined before use
*curly brackets after if conditions
*lonely if converted to else if

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-08-11 08:29:03 +10:00
Mark Drobnak 90b075f11f Merge pull request #816 from pi-hole/tweak/teleporter_auditlist
Offer possibility to import auditlog.list from teleporter archive
2018-08-10 18:06:57 -04:00
Mark Drobnak 321b2023de Merge pull request #815 from rrobgill/pietooltips
Pie-chart custom tooltips
2018-08-10 17:34:30 -04:00
DL6ER 78d262d7b0 Offer possibility to import auditlog.list from teleporter archive
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-10 18:25:12 +02:00
DL6ER 97055e4223 Merge pull request #814 from pi-hole/new/reply_type_DOMAIN
Be able to show more response types on Query Log page
2018-08-10 14:44:20 +02:00
Rob Gill ff29a440b5 Double quotes.
i <3 codacy-bot

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 13:39:14 +10:00
Rob Gill ad2439c46d Adjust customToolTips to deal with pie charts
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 13:16:46 +10:00
Rob Gill 50f842cb9a Constrain pie chart tooltips
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 10:00:47 +10:00
Rob Gill 4cf14dfc30 Constrain tooltips for piecharts
This stops the tooltips from disappearing beyond the pie chart's canvas.

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-08-10 09:59:31 +10:00
DL6ER afc97b1004 :codacy: review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 18:20:09 +02:00
DL6ER 5360bfae9d Add RRNAME as reply type for TXT queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 18:07:40 +02:00
DL6ER f2cf9ab8d7 Add further reply types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 17:46:50 +02:00
DL6ER 423084dc3b Restructure long chain of "if" statements into a set of "switch" statements. No functional change!
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-09 17:44:26 +02:00
DL6ER 82f4d718aa Merge pull request #812 from pi-hole/fix/settings_page_adlists_show_everything
Don't require adlists to start in "http"
2018-08-08 21:32:18 +02:00
DL6ER 2df4a0d052 Improve logic
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-08 21:17:10 +02:00
DL6ER 2db2d1f015 Merge pull request #811 from pi-hole/tweak/dashboard_displayed_time_interval
Acknowledge possible custom time interval
2018-08-08 21:04:46 +02:00
DL6ER 8b1313b864 Don't require adlists to start in "http". This also displays lists that start in e.g., "ftp://" or "file://" or without a protocol.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-08 12:06:59 +02:00
DL6ER 73265605c2 Acknowledge possible custom time interval set by MAXLOGAGE in pihole-FTL.conf
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-08 10:35:31 +02:00
Mark Drobnak 4d42735676 Merge pull request #807 from abrasive-blueberry/devel
Update settings.php
2018-08-06 20:00:00 -05:00
abrasive-blueberry 85fd1ba95a Update settings.php 2018-08-06 22:36:44 +01:00
Mark Drobnak b2c1f28624 Merge pull request #805 from pi-hole/release/v4.0
Git Flow - Release/v4.0 merge back to development
2018-08-06 16:13:54 -05:00
Mark Drobnak 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
DL6ER 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
Dan Schaper 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
Mcat12 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
Mcat12 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
Mark Drobnak 97023278b3 Ignore commented lines in list files
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-07-31 21:12:41 -04:00
Mark Drobnak 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
Dan Schaper 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
Mark Drobnak 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
Mark Drobnak 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
Mcat12 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
Mcat12 2188103b5c Update blocklist wording and help page
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-22 11:57:16 -04:00
Mark Drobnak 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
DL6ER 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
DL6ER 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
Mcat12 dd77a6af58 Add missing semicolon
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-15 16:43:14 -04:00
Mcat12 846e3e4184 Fix lag by limiting rendering to every 50ms
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-15 15:04:38 -04:00
Mcat12 4542a68f2f Fix y value of tooltip scaling incorrectly
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-15 15:04:07 -04:00
Mark Drobnak 3d0d3a9230 Merge pull request #785 from pi-hole/tweak/teleporter/regex
Add regex support for Teleporter
2018-07-15 11:56:30 -04:00
DL6ER 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
DL6ER 3e4613caf0 Move function add_regex($regex) to func.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-07-15 12:48:46 +02:00
DL6ER 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
DL6ER 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
DL6ER 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
DL6ER 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