Commit Graph

3844 Commits

Author SHA1 Message Date
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
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
DL6ER 6e49ee03a2 Merge pull request #1522 from Epoxide/fix/settings/dns/conditional-forwarding-typo
fix(settings): typo in conditional forwarding
2020-07-21 19:03:10 +02:00
Epoxide 320ca55739 fix(settings): typo in conditional forwarding
Signed-off-by: Epoxide <epoxide@epoxide.se>
2020-07-21 18:12:43 +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
DL6ER 3b2f70f715 Merge pull request #1500 from yubiuser/fix/sidebar
Remove duplicated sidebar entry for Local DNS Records
2020-07-17 09:41:07 +02:00
DL6ER 0255905216 Merge pull request #1501 from yubiuser/tweak/FTL_startDateTime
Show date and time FTL started in settings page
2020-07-17 09:38:44 +02:00
DL6ER 4ca0b3c106 Merge pull request #1494 from vmstan/devel
Remove duplicate DNSSEC explanation
2020-07-17 09:19:49 +02:00
Michael Stanclift 658033143e Remove duplicate DNSSEC explanation
Signed-off-by: Michael Stanclift <mstanclift@vmware.com>
2020-07-16 21:53:31 -05:00
yubiuser 495a96a16e Show date and time FTL started in settings page
Signed-off-by: yubiuser <ckoenig@posteo.de>
2020-07-17 00:04:37 +02: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 92befcebdd Merge pull request #1491 from pi-hole/release/v5.1
release/v5.1 -> devel
2020-07-16 14:04:59 +01:00
XhmikosR 49178c8dd7 Update devDependencies and regenerate package-lock.json (#1483)
We are down to 0 vulnerabilities again.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-07-14 08:35:55 +03: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
dependabot-preview[bot] b1d69f5e72 Bump xo from 0.32.0 to 0.32.1
Bumps [xo](https://github.com/xojs/xo) from 0.32.0 to 0.32.1.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](https://github.com/xojs/xo/compare/v0.32.0...v0.32.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-05 07:51:09 +00: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 40a3974faa Merge pull request #1467 from pi-hole/pkg
Update devDependencies and regenerate package-lock.json
2020-07-02 10:47:10 +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
XhmikosR 37fd2d22f1 Update devDependencies and regenerate package-lock.json
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-07-02 12:06:10 +03:00
XhmikosR 3fd0f2deaa Add CodeQL Action (#1476)
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-07-02 12:04:43 +03: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 a816a4fe34 Merge pull request #1475 from pi-hole/new/more_query_types
Only show query types for which the count is larger than zero
2020-06-28 23:04:34 +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 156b7b4efa Update settings.php
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2020-06-23 21:26:43 +02: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
DL6ER 78e1f3c09f Review comments on code style
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-21 21:50:55 +02:00
DL6ER f06a2b6ed1 CSS: Use rgba() instead of hex-color.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-21 21:45:22 +02: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
dependabot-preview[bot] 536ecd69c3 Bump autoprefixer from 9.8.0 to 9.8.1
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.8.0 to 9.8.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.0...9.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-20 15:30:46 +00:00
Adam Warner 05582b9722 Merge pull request #1251 from willemstuursma/fix-warning-for-unlink
Fixes #1227 Fix possible warning when unlinking files
2020-06-17 07:09:53 +01: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 852d5ce4de Merge pull request #1453 from pi-hole/rm-footer-dead-code
footer.js: remove dead code.
2020-06-14 21:06:21 +02: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
Willem Stuursma-Ruwen 95379bbe7c #1227 Test if file exists instead of silencing errors 2020-06-10 21:29:45 +02:00
Adam Warner 557bd85814 change button type on dhcp static lease removal back to submit (#1456)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-09 09:28:45 +03:00
XhmikosR 0303fb6f5f footer.js: remove dead code.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-06-08 07:50:08 +03:00
DL6ER d5de84090e Merge pull request #1452 from pi-hole/XhmikosR-patch-1
network.js: use `utils.datetime()`
2020-06-07 17:11:48 +02: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
Adam Warner 228ea0a9ba Merge pull request #1449 from pi-hole/dont-fallover-on-duplicates
Dont hard fail when adding duplicate adlists
2020-06-07 10:25:21 +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