Commit Graph

1561 Commits

Author SHA1 Message Date
DL6ER 1ea21911cf Merge pull request #1630 from pi-hole/new/mesage_dnsmasq_config_errors
Print fatal dnsmasq errors
2020-11-18 00:11:32 +01:00
DL6ER 5e808765e3 Print fatal dnsmasq errors
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-17 22:41:00 +01:00
DL6ER 4ee491115a Show upstream destination a query was sent to in the Query Log (both standard and long-term)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-13 01:01:49 +01:00
Adam Warner 5465d93558 Merge pull request #1624 from pi-hole/fix/null_unescape
return null if text passed is null. Don't try to unescape it!
2020-11-08 17:53:12 +00: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
DL6ER 22f0fd6a27 Merge pull request #1578 from sgtlaggy/fix-query-log-whitelist
Fix Whitelist buttons on query log pages
2020-11-08 18:29:18 +01:00
DL6ER 3739c1600e Merge pull request #1622 from pi-hole/tweak/queryFilters
Add altKey to modifiers when clicking on query log
2020-11-08 17:37:08 +01:00
Adam Warner 638a7db036 Merge pull request #1603 from thislooksfun/devel
Fix html escaping showing up in input fields. (#1584)
2020-11-08 15:40:04 +00:00
Adam Warner 33b660d4fa Merge pull request #1610 from pi-hole/fix/query_retries
Add new query status 12 and 13 (retried queries)
2020-11-08 15:23:00 +00:00
Adam Warner dc5df4eefa Merge pull request #1600 from rickbau5/fix/enable-ui-elements
Fix UI Remaining Disabled in Groups & Adlists Pages
2020-11-08 15:21:58 +00:00
Adam Warner e6e3be489b Add altKey to modifiers when clicking on query log
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-08 14:58:58 +00:00
Adam Warner 0e43b1f3cf Merge pull request #1563 from yubiuser/tweak/DNSRecordsCNAMETable
Remember last used sort column/direction on Local DNS Records table and CNAME table
2020-11-08 14:23:05 +00:00
Adam Warner 280d31c00f Merge branch 'devel' into fix/group_sel_simple_pages 2020-11-08 13:57:52 +00:00
Adam Warner 56b5e0d3df Merge pull request #1284 from Th3M3/queryads
Use two different divs for mobile and desktop instead of a JS solution
2020-11-08 13:36:59 +00:00
XhmikosR 274c196e42 Lint.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-10-26 06:16:04 +00:00
DL6ER 6fcd137ed9 Add new query status 12 and 13 (retried queries).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-10-22 22:30:38 +02:00
Dan Schaper aa42450ea9 Merge pull request #1489 from pi-hole/XhmikosR-patch-1
Fix HTML validation errors in header.php
2020-10-14 04:13:59 -07:00
XhmikosR dbff9360f2 Update scripts/pi-hole/php/header.php
Co-authored-by: cleroux <leroux.cedric@gmail.com>
2020-10-14 13:22:58 +03: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
Adam Warner 0db41baa23 Simplify query log filter.
Don't require modifier keys to interact (now works on mobile)
Hold modifier key to enable selection for copying domain (long press on mobile)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-10-12 17:41:38 +01:00
Kurtis d3395a1dd4 Fix symbol for devices that do not use Pi-hole
Signed-off-by: Kurtis <kbohlen@sfu.ca>
2020-10-09 12:54:27 -07:00
Adam Warner 891f61a479 Merge pull request #1579 from pi-hole/new/adlist_date_updated
Show last update time of an adlist
2020-10-09 14:04:15 +01:00
Rick Boss 197592a97c Ensure UI is reenabled in missed error cases
Signed-off-by: Rick Boss <rickeboss@gmail.com>
2020-10-07 22:47:30 -07:00
Adam Warner 92ef12dd37 Update scripts/pi-hole/js/footer.js 2020-09-18 09:58:29 +01:00
Adam Warner 8007925cd2 give the two radio buttons in custom select each an ID, and exclude them when theming radio buttons
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-09-18 09:24:33 +01:00
Tony Jeffree b7244ad56a Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
2020-09-14 11:11:27 +01:00
Adam Warner 790793a16f Address some of @dl6er's comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-09-12 11:32:41 +01:00
Adam Warner 8ecb72c0cc Tweak to the login button and Forgot Password section to make it more obvious which is the correct button.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-09-11 17:46:04 +01:00
DL6ER f61d2705b1 Show last update time of an adlist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-09-07 21:12:36 +02:00
sgtlaggy caf9e2af09 fix whitelist buttons on query log page
Signed-off-by: sgtlaggy <8661717+sgtlaggy@users.noreply.github.com>
2020-09-05 14:04:56 -07:00
DL6ER 3384690bf2 Merge pull request #1285 from pi-hole/new/mac_clients
Allow defining clients by their MAC address
2020-08-25 20:19:48 +02:00
DL6ER 75b051fcb0 Merge pull request #1564 from Ninjaclasher/ninjaclasher/patch-1
Make login form button more mobile friendly
2020-08-20 00:12:58 +02:00
DL6ER 0c102fc1d3 Merge branch 'devel' into new/mac_clients 2020-08-19 22:11:43 +02:00
yubiuser 7f1be9d330 Remove degree symbole from Kelvin
Signed-off-by: yubiuser <ckoenig@posteo.de>
2020-08-19 13:24:46 +02:00
Evan 93d8084ea4 Make login form button more mobile friendly
Signed-off-by: Evan <evanzhang1028@hotmail.com>
2020-08-17 11:01:00 -04:00
Tony Jeffree d47dee7937 Use last modified time
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
2020-08-17 08:30:00 +01:00
Tony 0a4ebe14e3 Add cache busting to all custom scripts and common css
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
2020-08-17 08:30:00 +01:00
Tony 2495ffc313 Add cache busting variable to Pi-hole js/css
Signed-off-by: Tony <tjeffree@gmail.com>
2020-08-17 08:28:28 +01:00
yubiuser 87fa180e67 Remember last used sort column/direction on Local DNS Records table and CNAME table
Signed-off-by: yubiuser <ckoenig@posteo.de>
2020-08-16 23:13:49 +02:00
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