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
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
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
881d80b7f7
Don't append DNSSEC status if wildcard blocked
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-14 17:25:22 +02:00
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
2aef235040
Use client address if name is empty
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-07 19:05:27 +02:00
357da1d15a
Expose both name and IP of client
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-06-06 18:27:55 -04:00
36930e3834
Add regex support on the web interface
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-05 10:35:41 +02:00
c93fe7a93f
Fix syntax
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-03 12:29:28 +02:00
65cb428f35
Codacy forces { } even for single lines
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-03 12:24:15 +02:00
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
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
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
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
96039f52a5
fix typo in cookie check
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-01 09:52:07 +10:00
842b503f98
Merge pull request #687 from Toakan/LogScroll
...
Log scroll
2018-05-29 18:18:31 -04:00
523b4c390d
Merge pull request #522 from Th3M3/clean_up_style-rules
...
Clean up style rules
2018-05-29 18:16:31 -04:00
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
5171158b12
Merge pull request #756 from rrobgill/fixquerysorting
...
Fix query sorting by Reply, DNSSEC and Action
2018-05-28 16:53:38 -04:00
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
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
49d6feb4c3
Fix 579 | Add interface option for administrator email address (Redo of #757 )
...
Signed-off-by: Kevin Kirsche <Kev.Kirsche@gmail.com >
2018-05-26 23:17:17 -04:00
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
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
c8f0db326b
Remove ancient and completely outdated PHP-only API. Pi-hole v4.0 will only use the FTL-PHP API.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-24 14:06:46 +02:00
32c55577f1
Remove max line length in getResponseFTL
...
Fixes issue found on Discourse: https://discourse.pi-hole.net/t/9544
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com >
2018-05-16 11:27:54 -04:00
fc795e3b10
Merge pull request #743 from rrobgill/cookielogin
...
Persistent login cookie
2018-05-14 21:03:16 -04:00
967763b6da
indenting
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-15 10:56:49 +10:00
30bef67a88
indenting
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-15 10:55:46 +10:00
c2a9e80db6
indenting
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-15 09:05:19 +10:00
72e95cec96
indenting
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-15 09:03:09 +10:00
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
0d283bbfa2
Address codacy issues
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-10 15:26:44 +02:00
d42784be8c
Address codacy issues
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-10 15:22:00 +02:00
73df3bddb6
Add "Top Clients (blocked only)" table
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-10 15:11:22 +02:00
7a3fc169a5
Update password.php
2018-05-10 09:14:57 +10:00
5733d08745
Remove invalid cookie
...
If cookie is invalid, it is cleared from the browser before continuing
2018-05-10 08:54:44 +10:00
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
adeec42dd4
relocate checkbox
...
Persistent login checkbox moved from form feedback.
2018-05-09 08:31:34 +10:00
8eed0e09d9
Update loginpage.php
2018-05-08 19:05:42 +10:00
a8bf42687c
Update password.php
2018-05-08 19:05:19 +10:00
84b6f6b291
Update password.php
2018-05-08 17:24:11 +10:00
d64292ba5c
Update loginpage.php
2018-05-08 17:24:09 +10:00
fb988f247d
Cookie login
...
Allow user to (optionally) set a cookie for automatic login.
UI addition of checkbox and informs user of option to store a cookie.
2018-05-05 14:45:04 +10:00
85dd92771a
Cookie login
...
Allow user to (optionally) set a cookie for automatic login.
Expiry is set for 7 days.
Cookie refreshes, extending for 7 days from each use.
2018-05-05 14:42:04 +10:00
bd25557469
Remove last traces of local custom port settings
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-04 22:11:50 +02:00
dd96847cc5
Remove local DNS with custom port field as it is superseeded by the more powerful custom 1/2/3/4 implementation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-04 19:16:55 +02:00
6d8c3de5ba
Support custom ports in the custom DNS server tab on the settings page
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-04 19:14:31 +02:00
d2a20b1f0c
Merge pull request #735 from walter-exit/devel
...
Gravity: date last changed (Web & API)
2018-05-02 14:28:20 -04:00
967216ca74
Signed-off-by: Walter <walter@exclusive-it.nl>
2018-05-02 20:12:15 +02:00
DL6ER
Mark Drobnak
Rob Gill
DL6ER
Kevin Kirsche
rrobgill
Walter