Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 04:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

803 Commits

Author SHA1 Message Date
DL6ER
318179d82d Merge branch 'devel' into new/longterm/select_query_type 2018-08-24 14:09:46 +02:00
DL6ER
3169b5ba88 Add selection for query types on long term DB query log page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-24 14:09:08 +02:00
DL6ER
a692bdea27 Add missing semicolon 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-21 18:39:50 +02:00
Mark Drobnak
81561f5da5 Merge pull request #826 from pi-hole/fix/client-colors 
Use random colors in client graph if presets run out
 2018-08-21 10:16:37 -04:00
DL6ER
77efbac43d Show cache info on Settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-21 15:42:15 +02:00
Mcat12
9367e8115e Add support for new query statuses in long term query log 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 16:28:02 -04:00
Mark Drobnak
ec96282fd8 Merge pull request #824 from pi-hole/tweak/blocked_instead_of_Piholed 
Change "Pi-holed" to "Blocked" on the Query Log
 2018-08-17 12:49:33 -04:00
DL6ER
511b42352a Do not show whitelist button for externally blocked domains as whitelisting these domains has not yet been implemented 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-17 18:26:21 +02:00
Mark Drobnak
d7b328e103 Use doublequote strings and add comment 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-08-16 17:47:05 -04:00
Mark Drobnak
6af8c76c3f Use random colors in client graph if presets run out 
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
 2018-08-16 17:38:02 -04:00
DL6ER
9646468022 +Show whitelisting button for regex blocked queries as pihole-FTL can actually whitelist regex filtered domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-16 14:24:32 +02:00
DL6ER
c6b6edae05 Change "Pi-holed" to "Blocked" on the Query Log. Also add a new "Blocked (external)" status that will be used by a future version of FTL. I also removed the addition of the dnssec status to the "Blocked (gravity)" status as requests answered from the blocking lists do not have a DNSSEC status. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-16 14:16:30 +02:00
DL6ER
55969fab4b A = 1, AAAA = 2, ... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-15 15:20:27 +02:00
DL6ER
a72dbd8f91 :codacy: changes 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-15 15:17:37 +02:00
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
321b2023de Merge pull request #815 from rrobgill/pietooltips 
Pie-chart custom tooltips
 2018-08-10 17:34:30 -04: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
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
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
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
DL6ER
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
DL6ER
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
Mcat12
60ca5e06fa Merge remote-tracking branch 'origin/devel' into new/regex-support 2018-06-29 23:49:28 -04:00
Mcat12
9bc09564ba Improve readability of long term summary stats 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-25 19:44:22 -04:00
DL6ER
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
DL6ER
3f7246968e Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 20:01:46 +02:00
DL6ER
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
DL6ER
a98df3d190 Merge branch 'devel' into new/regex-support 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	scripts/pi-hole/js/queries.js
 2018-06-17 15:04:01 +02:00
Mark Drobnak
6fd0709f72 Merge pull request #763 from pi-hole/query-log/remove_DNSSEC_extra_column 
Query Log: Remove DNSSEC column
 2018-06-14 20:37:37 -04:00
DL6ER
881d80b7f7 Don't append DNSSEC status if wildcard blocked 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-14 17:25:22 +02:00
Mark Drobnak
81b97eaf8b Merge pull request #762 from pi-hole/feature/PHP_error_display 
Settings page: Display PHP errors
 2018-06-07 21:43:38 -04:00
DL6ER
2aef235040 Use client address if name is empty 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-07 19:05:27 +02:00
Mcat12
357da1d15a Expose both name and IP of client 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-06 18:27:55 -04:00
DL6ER
36930e3834 Add regex support on the web interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-05 10:35:41 +02:00
DL6ER
c93fe7a93f Fix syntax 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:29:28 +02:00
DL6ER
65cb428f35 Codacy forces { } even for single lines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:24:15 +02:00
DL6ER
965a8f31c7 Remember last selected "Show X entries" in Query Log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:11:55 +02:00
DL6ER
adfa0b6a03 Remember last selected "Show X entries" in Query Log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 12:09:52 +02:00