Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 02:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,860 Commits 23 Branches 114 Tags
72abc5dad4e132a53fb0e7c9d2f6e67f329acc2d
Commit Graph

787 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
Rob Gill
96039f52a5 fix typo in cookie check 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 09:52:07 +10:00
Mark Drobnak
842b503f98 Merge pull request #687 from Toakan/LogScroll 
Log scroll
 2018-05-29 18:18:31 -04:00
Mark Drobnak
523b4c390d Merge pull request #522 from Th3M3/clean_up_style-rules 
Clean up style rules
 2018-05-29 18:16: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
Kevin Kirsche
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
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
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
Mark Drobnak
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
Mark Drobnak
fc795e3b10 Merge pull request #743 from rrobgill/cookielogin 
Persistent login cookie
 2018-05-14 21:03:16 -04:00
Rob Gill
967763b6da indenting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 10:56:49 +10:00
Rob Gill
30bef67a88 indenting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 10:55:46 +10:00
Rob Gill
c2a9e80db6 indenting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 09:05:19 +10:00
Rob Gill
72e95cec96 indenting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 09:03:09 +10: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
Rob Gill
7a3fc169a5 Update password.php 2018-05-10 09:14:57 +10:00
Rob Gill
5733d08745 Remove invalid cookie 
If cookie is invalid, it is cleared from the browser before continuing
 2018-05-10 08:54:44 +10: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
Rob Gill
adeec42dd4 relocate checkbox 
Persistent login checkbox moved from form feedback.
 2018-05-09 08:31:34 +10:00
Rob Gill
8eed0e09d9 Update loginpage.php 2018-05-08 19:05:42 +10:00
Rob Gill
a8bf42687c Update password.php 2018-05-08 19:05:19 +10:00
rrobgill
84b6f6b291 Update password.php 2018-05-08 17:24:11 +10:00
rrobgill
d64292ba5c Update loginpage.php 2018-05-08 17:24:09 +10:00
rrobgill
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
rrobgill
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
DL6ER
bd25557469 Remove last traces of local custom port settings 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-04 22:11:50 +02:00
DL6ER
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
DL6ER
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