Commit Graph

71 Commits

Author SHA1 Message Date
Adam Warner
074621be54 use textContent instead ot innerHTML to prevent possible xss attack
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-11 20:04:34 +01:00
DL6ER
5533b4fc9e Improve formatting and make status texts more human-friendly
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-02-07 11:24:23 +01:00
DL6ER
0de0edcc9b Merge branch 'devel' into tweak/replace_domains 2020-11-09 22:28:13 +01:00
DL6ER
a3b24e08aa Reduce code-duplication by moving the addFromQueryLog() function into utils.js. This also fixes non-visible modals on the long-term query log page.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-09 21:33:09 +01:00
Adam Warner
78f88d9633 return null if text passed is null. Don't try to unescape it!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-08 17:35:24 +00:00
thislooksfun
8f55dfa03b Fix html escaping showing up in input fields. (#1584)
Signed-off-by: thislooksfun <thislooksfun@repbot.org>
2020-10-12 12:26:49 -05:00
DL6ER
0c102fc1d3 Merge branch 'devel' into new/mac_clients 2020-08-19 22:11:43 +02: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
DL6ER
1b129bcad0 Merge branch 'release/v5.2' into new/mac_clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-07-30 21:56:21 +02: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
XhmikosR
ea1fd6c323 Remove HTML from titles when not needed.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-22 08:53:48 +03:00
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-05 22:24:17 +02:00
DL6ER
9b8946ee9f Merge branch 'devel' into tweak/exact_searching
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-03 15:21:12 +02:00
Adam Warner
02a4e83d87 create utils.getGraphType() function.
also apply setting to long term graphs
flip logic - only return "line" if the setting is explicitly set to "false"

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-01 21:10:14 +01:00
XhmikosR
af47854a2d Use prop() for the disabled attribute.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-30 10:22:35 +03:00
XhmikosR
61c29cafc4 Move padNumber() to utils.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-29 11:11:34 +03:00
XhmikosR
7f71f1d5fe Move objectToArray() to utils.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-29 11:11:32 +03:00
XhmikosR
eab6485edb Move escapeHtml to utils.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-29 07:41:05 +03:00
Adam Warner
3957e9eef1 Move some duplicated code to utils.js
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-23 11:04:30 +03:00
XhmikosR
4247c973c9 Rename function.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-23 10:29:50 +03:00
XhmikosR
444e97b2b9 Rename groups-common.js to utils.js.
It's not used only in group pages, and we should try to move more common stuff here later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-23 10:29:48 +03:00