Commit Graph

1464 Commits

Author SHA1 Message Date
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
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
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
Adam Warner
f494938b56 Merge pull request #1436 from pi-hole/long-term
Fix typo "Long term" -> "Long-term"
2020-06-05 19:15:31 +01:00
DL6ER
a7bc6e8999 Store NULL for emtpty descriptions and comments in the groups database tables.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-05 11:53:10 +02:00
XhmikosR
68297b14b6 Merge pull request #1374 from pi-hole/radix
Enable radix ESLint rule
2020-06-05 10:28:03 +03:00
Adam Warner
ca0800b351 Merge pull request #1431 from pi-hole/fix/memory_warning
Extend warning shown on server-side data processing errors
2020-06-04 18:17:23 +01:00
Adam Warner
c04dd08cd2 Merge pull request #1356 from pi-hole/tweak/hostname_error_message
Add support for HOSTNAME diagnostics message
2020-06-04 18:16:29 +01:00
XhmikosR
9aa11ec6aa Fix typo "Long term" -> "Long-term"
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-04 19:01:10 +03:00
DL6ER
4bf018b52c Add missing radix information in parseInt().
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 16:57:55 +02:00
XhmikosR
a9cee0039a Improve CSP config (#1377)
* Remove `'unsafe-eval'`; this was needed in the past for Chart.js.
* Remove `https://api.github.com` since we don't make any requests to this domain client-side
* Specify more directives which are not inherited by `default-src`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-04 17:40:39 +03:00
XhmikosR
cd99d3385a Merge pull request #1362 from pi-hole/jquery-3
Update jQuery to v3.5.1.
2020-06-04 17:38:38 +03:00
DL6ER
ffbeba4ad5 Extend warning shown on server-side data processing errors.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 14:55:55 +02:00
DL6ER
c6abbac3e1 Unlike the standard PHP engine, others might actually be case-sensitive. (#1428)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 15:13:15 +03:00
DL6ER
62ac7e58a3 Merge pull request #1425 from pi-hole/fix/group-page-single-group
Fix regression introduced in group entry changes
2020-06-04 13:58:27 +02:00
XhmikosR
f5d1077bcc queryads.js: fix off by one in the viewport check.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-04 14:49:17 +03:00
XhmikosR
87e49b2e07 Fix .context usage in our code
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-04 14:49:17 +03:00
XhmikosR
92e2288f0a Update jQuery to v3.5.1.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-04 14:49:17 +03:00
DL6ER
80873e83e8 Modify how we add data to the stacked bar charts on the dashboard.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 13:24:34 +02:00
DL6ER
f4fe04dd16 Add placeholder to the search field to highlight what can be searched for
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 10:52:35 +02:00
DL6ER
fafdf37533 Remove parseInt() from values guaranteed to be int from the API.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 10:38:51 +02:00
DL6ER
3d423ede5f Use classes instead of manipulating CSS directly for getting the pointer.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 10:26:54 +02:00
DL6ER
e357a925b5 Add tooltip and click cursor to enhance accessibility of the click filtering feature.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 10:08:13 +02:00
DL6ER
68e03df011 Simplify button by removing the description of what we are filtering.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 09:44:22 +02:00
DL6ER
540ebddb8c Merge branch 'devel' into new/rev-server
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 09:24:49 +02:00
Adam Warner
075c474fbc Use new Array().join() for space generation.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-03 20:32:55 +01:00
DL6ER
1df85ff7a9 Simplify code for space generation and use HTML entities.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-03 18:05:30 +01:00
DL6ER
c45bcd9d8e Add support for HOSTNAME diagnostics message
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-03 18:05:30 +01:00
Adam Warner
981cba14f2 Use PHP builtin to split the input by space. Automatically takes into account " chars
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-03 16:50:33 +01:00
XhmikosR
a70eb512c0 Remove unneeded chart.update() calls.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-03 17:38:38 +03:00
XhmikosR
3b22d681ff Specify animation: false for the bar graphs
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-03 17:38:35 +03:00
XhmikosR
38dc8a5f13 Update Chart.js to v2.9.3.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-03 17:38:28 +03:00
DL6ER
55ab4f179f Minor style changes for the dark theme.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-03 15:51:39 +02:00