Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 18:29:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,875 Commits 23 Branches 114 Tags
ebe6527ab7e74d351b8aec022ab38e1a32a2ff25
Commit Graph

1497 Commits

Author SHA1 Message Date
DL6ER
ebe6527ab7 Merge pull request #1541 from pi-hole/fix/wording_query_log_links 
Fix a few UI issues
 2020-08-15 13:07:37 +02:00
Adam Warner
17d9aec072 Merge pull request #1559 from yubiuser/revert/disableModal 
Revert "Add 'seconds' to custom disable timeout modal"
 2020-08-15 10:47:49 +01:00
Adam Warner
acfc29004d Merge pull request #1529 from yubiuser/tweak/24hTimeRangePicker 
Change timePicker to 24h format in dateragepicker
 2020-08-15 10:35:59 +01:00
Adam Warner
c4691ac672 Merge pull request #1558 from pi-hole/master 
master -> devel
 2020-08-14 22:04:06 +01:00
yubiuser
52d3c33c0f Revert "Add 'seconds' to custom disable timeout modal" 
This reverts commit c15a8ecde2.

Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-14 20:47:22 +02:00
Dan Schaper
847ee656d3 Merge pull request #1544 from yubiuser/tweak/disableModal 
Add 'seconds' to custom disable timeout modal
 2020-08-10 10:54:00 -07:00
DL6ER
a612b14680 Do not require first element to be a hex value at any costs. It may also be a : in the valid address ::1 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-08-04 22:09:33 +02:00
yubiuser
c15a8ecde2 Add 'seconds' to custom disable timeout modal 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-03 11:42:41 +02:00
yubiuser
02e0b1639d XO fixes 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-02 22:16:41 +02:00
yubiuser
70f5664bea Fix indentation for custom CNAME as well 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-02 20:52:32 +02:00
yubiuser
2667eb1c26 Fix indentation 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-02 20:42:42 +02:00
DL6ER
01aca3242f Add link to Query Log from Clients over Time bar graph bars. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-08-02 20:05:49 +02:00
DL6ER
64a2419fa9 Add ability to filter for blocked queries in conjunction the client filter in the Query Log. Request such filtered data when clicking on a client in the Top Clients (blocked only) table on the dashboard. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-08-02 19:54:54 +02:00
DL6ER
0865123914 Merge pull request #1518 from pi-hole/fix/audit_log 
Fix audit log button
 2020-07-30 21:49:59 +02:00
DL6ER
1536cfd307 Merge pull request #1519 from pi-hole/fix/query_type_links 
Fix query types links on the dashboard (Query Types pie chart)
 2020-07-30 21:49:50 +02:00
yubiuser
3b618add09 Adds ALL to list selector in Local DNS Records and CNAME Records 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-26 21:40:07 +02:00
yubiuser
5565d00617 Change timePicker to 24h format in dateragepicker 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-26 12:47:32 +02:00
DL6ER
4e8584a771 Merge pull request #1514 from pi-hole/fix/arpflush 
Fix ARPFLUSH button on the settings page
 2020-07-21 12:52:25 +02:00
DL6ER
d647792655 Fix query types links on the dashboard (Query Types pie chart) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 22:33:17 +02:00
DL6ER
fdea341c9f Fix audit log button doing nothing (resp. wrongthing) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 22:04:59 +02:00
DL6ER
8672c49b4b Replace "." by "_" in hostnames to work around a PHP Phar bug. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 21:43:44 +02:00
DL6ER
99adb3012b Fix arpflush command 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-19 22:13:05 +02:00
yubiuser
1fce1f6fa0 Fix sidebar animation angle for Local DNS Records (#1507) 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-18 06:51:49 +03:00
yubiuser
018d047de7 Remove duplicated sidebar entry for Local DNS Records 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-16 23:39:53 +02:00
Adam Warner
3a68efc4b0 fix a complaint from the CI 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-16 18:44:00 +01:00
Adam Warner
e0cd37b781 Merge branch 'release/v5.1' into ip-sorting-query 2020-07-16 18:38:53 +01:00
DL6ER
cb5b9c69c4 Merge pull request #1278 from marank/devel 
Added support for CNAME records add/remove
 2020-07-07 23:13:48 +02:00
Adam Warner
c42c06be2d Merge pull request #1208 from pi-hole/new/rev-server 
Improve conditional forwarding settings
 2020-07-02 10:51:41 +01:00
Adam Warner
15b59954ca Merge pull request #1460 from pi-hole/groups-tootlip 
Remove HTML from titles when not needed.
 2020-07-02 10:44:29 +01:00
Adam Warner
f31048c228 Merge pull request #1472 from pi-hole/tweak/custom_DNS 
Tweak/custom dns
 2020-07-01 09:13:28 +01:00
DL6ER
1482b9055d Update scripts/pi-hole/php/savesettings.php 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-30 22:55:06 +02:00
DL6ER
aeba7c958d Only show query types for which the count is larger than zero. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-28 21:41:39 +02:00
Adam Warner
f51705b675 Don't add #53 to any passed IP value by default, only add custom port if it is specified by the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:54:23 +01:00
Adam Warner
297c1b019f response is expected to be empty here, as far as I can tell. Reverting this logic change prevents a misleading message being displayed to the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:46:22 +01:00
DL6ER
59bd4de97e Merge pull request #1222 from pi-hole/tweak/exact_searching 
Improve filtering on table pages
 2020-06-23 21:26:30 +02:00
XhmikosR
ea1fd6c323 Remove HTML from titles when not needed. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-22 08:53:48 +03:00
Matthias rank
773fed0f21 Incorporate upstream changes 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-06-21 13:55:50 +02:00
marank
b597a0fcbb Merge branch 'devel' into devel 2020-06-21 12:20:33 +02:00
Adam Warner
d187219f5a Merge pull request #1443 from pi-hole/sanitise-group-input 
Prevent possible XSS attack vector in the input fields of the group section
 2020-06-14 23:25:12 +01:00
DL6ER
1819abee76 Merge branch 'devel' into tweak/exact_searching 2020-06-14 20:48:08 +02:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 18:50:36 +01:00
XhmikosR
0303fb6f5f footer.js: remove dead code. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-08 07:50:08 +03:00
XhmikosR
7bfc7cbcd5 network.js: use utils.datetime() 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 17:03:23 +03:00
XhmikosR
1bef0bb17b Tweak CSP (#1445) 
Switch to `default-src` `'none'` and specify the directives we were missing that were being inherited.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 14:20:45 +03:00
Adam Warner
606568054a enable IP sorting on the query/long-term query pages. Appears to work with a mixture of hostnames/IP's 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-07 11:09:20 +01:00
Adam Warner
7b555dcf55 Merge pull request #1451 from pi-hole/rm-iCheck 
Remove the unused iCheck.min.js
 2020-06-07 10:49:43 +01:00
XhmikosR
a041cdcbd3 Remove the unused iCheck.min.js 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 10:41:36 +03:00
Adam Warner
5b71dab0c7 Change INSERT statement to INSERT OR IGNORE on adlist management as a workaround for now 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-06 18:27:22 +01:00
Adam Warner
efd9281fa4 Merge pull request #1442 from pi-hole/fix/null_comments_in_groups 
Store NULL for empty descriptions and comments in the groups database tables
 2020-06-05 19:17:57 +01:00
Adam Warner
7aa79a7a77 Merge pull request #1420 from pi-hole/tweak/improve_warnings 
Improve messages on the domain management pages
 2020-06-05 19:17:17 +01:00