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

467 Commits

Author SHA1 Message Date
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
DL6ER
2df0c21753 Remove extra DNSSEC column. Instead, we integrate the DNSSEC result into the STATUS column if available. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 11:32:33 +02:00
DL6ER
80017e9b41 Remove auto-dismissal for error messages on the settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-03 11:19:16 +02:00
Mark Drobnak
842b503f98 Merge pull request #687 from Toakan/LogScroll 
Log scroll
 2018-05-29 18:18:31 -04:00
DL6ER
2eb4f78e0d Merge pull request #744 from pi-hole/fix/show_blocked_permitted_only 
Correctly apply API_QUERY_LOG_SHOW filters on dashboard
 2018-05-29 15:24:36 +02:00
Mark Drobnak
5171158b12 Merge pull request #756 from rrobgill/fixquerysorting 
Fix query sorting by Reply, DNSSEC and Action
 2018-05-28 16:53:38 -04:00
Mark Drobnak
75559ef86e Merge pull request #759 from pi-hole/fix/getClientNames 
Fix a minor bug in api.php?getClientNames
 2018-05-28 14:36:53 -04:00
DL6ER
b2743ed245 Fix a minor bug with api.php?getClientNames when hostnames are present more than once on the local network (maybe once IPv6, once IPv4) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-28 17:42:11 +02:00
Rob Gill
0fd0061e73 Fix query sorting by Reply, DNSSEC and Action 
orderData added to column specifications, allowing sorting to work when storage and display columns do not match.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-26 20:25:34 +10:00
DL6ER
c6f5c2ee35 Display new dns_queries_all_types value (if available) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-25 09:53:30 +02:00
DL6ER
62f349b996 Top Clients (blocked): Compute frequency relative to number of blocked not total number of queries 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-10 15:29:38 +02:00
DL6ER
0d283bbfa2 Address codacy issues 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-10 15:26:44 +02:00
DL6ER
d42784be8c Address codacy issues 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-10 15:22:00 +02:00
DL6ER
73df3bddb6 Add "Top Clients (blocked only)" table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-10 15:11:22 +02:00
DL6ER
fd3a7d3f57 Don't return too early when filling tables with top domains/top ads data. Otherwise, we might miss to remove the loading spinners. This fixes an issue brought up on Discourse. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-09 18:39:29 +02:00
DL6ER
f9d456720f Relax warnings. They are not needed any more. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-29 17:30:42 +02:00
DL6ER
5f3f105387 Add frontend changes necessary for https://github.com/pi-hole/FTL/pull/264 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-28 23:09:54 +02:00
Adam Warner
c414a4aba1 Merge branch 'devel' into FTLDNS 2018-04-14 00:53:23 +01:00
Adam Warner
b09de8e615 Fix merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-14 00:43:27 +01:00
Adam Warner
2be54bc17a Prevent tooltip from being hidden by sidebar 2018-04-14 00:37:04 +01:00
DL6ER
081afa4924 Remove clients over time graph if no data is returned (privacy mode!) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 14:24:59 +02:00
DL6ER
634fa7f2b3 Remove top clients table if no data is returned (privacy mode!) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 14:22:35 +02:00
DL6ER
ad8228ea34 Merge branch 'devel' into FTLDNS 2018-04-04 12:35:53 +02:00
Mcat12
7244e3a9e0 Don't search for the element by ID when we already have it 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-04-02 17:43:19 -04:00
DL6ER
4cf0f4d6ff Make sure the properties exist when looping over objects 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-02 22:29:38 +02:00
DL6ER
e5e956ace6 Automatically detect which _meta to use 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-02 22:07:07 +02:00
DL6ER
8b2e7b89ac Add separate legends for pie charts on the dashboard. Fixes #635 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-02 14:36:21 +02:00
DL6ER
5e8f4b2584 Merge branch 'devel' into FTLDNS 2018-04-01 16:46:35 +02:00
DL6ER
dca374bfcd Simplify NODATA reply type (no need to show A/AAAA here as we show that in the second column) and add reply time if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-01 16:39:54 +02:00
DL6ER
5aba5a1314 Add missing semicolon 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 18:49:15 +02:00
DL6ER
27d40465cd Use jQuery's .html() routine to overwrite element's content 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 18:48:23 +02:00
DL6ER
7bf5207e06 Fix JS error 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 18:39:03 +02:00
DL6ER
2aca7bf764 customTooltips must be defined before used 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 14:00:02 +02:00
DL6ER
517fa24fe3 Show "N/A" for queries where the reply has not yet reached the Pi-hole 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 13:44:48 +02:00
DL6ER
062ba5141b Strings must use doublequote 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 11:32:36 +02:00
DL6ER
44774d914c We should split the string at ": " instead of at ":" to be fully compatible with IPv6 addresses 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-25 10:20:26 +02:00
DL6ER
e3cd76ad7d Add simple measure to prevent compression of the tooltip at the right edge of the screen (may be improved, not tested on mobile screens) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-20 16:50:53 +01:00