Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-27 05:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,181 Commits 24 Branches 113 Tags
196e226e2cf2c7ea0fd2e8b2c678da3587e4bf1f
Commit Graph

1663 Commits

Author SHA1 Message Date
Fabian Preuß
196e226e2c Add padding between if statements 
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de>
 2021-08-10 21:21:12 +02:00
Fabian Preuß
48ee7abbe8 Stop timer when user reenabled blocking early 
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de>
 2021-08-10 21:02:05 +02:00
Adam Warner
a7ec9510b5 re-implement fix introduced in 1664090a01 
Release v5.5.1 (based on `master`) has fixed this in `savesettings.php`, but the functionality has since been moved to `func.php` in `devel`, and so the fix needs applying here, too.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 20:44:20 +01:00
Adam Warner
647eba40d3 Merge branch 'release/v5.6' into devel 2021-08-04 20:32:59 +01:00
Adam Warner
dacdb3d72c Merge pull request #1857 from pi-hole/master 
Sync Master -> Dev
 2021-08-04 20:21:44 +01:00
Adam Warner
7aa8057df7 Merge pull request from GHSA-5cm9-6p3m-v259 
Fix (Authenticated) Remote Code Execution Possible in Web Interface 5.5
 2021-08-04 18:13:35 +01:00
Adam Warner
8066069a1f Prevent arbritary js code from beign returned from the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 17:29:57 +01:00
DL6ER
559150bb1f Fix inverse logic when adding domains on the group management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 19:03:34 +02:00
DL6ER
03920e3595 Move validation functions into func.php and use the same validation in all cases. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 16:59:16 +02:00
DL6ER
4e1f7c23a1 Merge branch 'devel' into update/dnsmasq-v2.86 2021-07-04 12:58:23 +02:00
Adam Warner
68034029b7 Merge pull request #1822 from adyanth/devel 
Adding CORS support via environment variable
 2021-07-04 11:49:01 +01:00
DL6ER
f5b59d141b Hide blackbutton for internally generated DNSSEC queries (they cannot be blocked) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-04 11:37:10 +02:00
DL6ER
0e25554cab Merge pull request #1844 from pi-hole/tweak/chartjs294 
Update Charts.js from 2.9.3 to 2.9.4
 2021-07-04 10:17:26 +02:00
Adam Warner
f229e4fcc9 Merge pull request #1832 from kthchew/safari-15 
Improve `theme-color` and `background-color` for different themes
 2021-07-04 01:51:32 +01:00
Adam Warner
5438430d6e Update to latest (and last) 2.x.x version of Chart.js to fix some bugs found in 2.9.3 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 22:24:34 +01:00
DL6ER
762aba21ec Add note when a BOGUS result was sent down from upstream (we cannot say why it failed in this case) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-03 09:37:25 +02:00
DL6ER
a120e72524 Add EDE if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-28 20:35:51 +02:00
DL6ER
122146fcc6 Update styling of scripts/pi-hole/js/settings.js 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-26 15:28:11 +00:00
DL6ER
df9bf15e75 Query Log: Show if a query was already answered or was only sent to an upstream (and we're still awaiting the reply) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-26 11:00:49 +02:00
Adam Warner
1664090a01 Escape . in regex for validDomainWildcard to ensure malicious commands cannot be passed to the function 
bonus, removed some trailing whitespace on line 30

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-06-23 17:34:43 +01:00
DL6ER
fb2b87e833 Add new DNSSEC reply type 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-23 11:43:14 +02:00
DL6ER
ca030bc0c9 Merge pull request #1838 from pi-hole/tweak/trailing-commas-js 
Prettier improvements for easier reviews
 2021-06-23 11:41:56 +02:00
DL6ER
0d0a8dba67 Change prettier option trailingComma from "none" to the new default "es5" (see https://prettier.io/docs/en/options.html#trailing-commas) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-23 11:26:43 +02:00
DL6ER
a2c64d6d19 Merge pull request #1836 from AlexLamond/auto-darkmode 
Added the option for an automatic dark mode based on the device status
 2021-06-22 16:15:51 +02:00
Alex L
57a5518c23 Update scripts/pi-hole/php/theme.php 
Corrected naming conventions for files and theme name

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
AlexLamond
5538af20b8 Added the option for an automatic dark mode based on the device status 
Signed-off-by: = <9060360+AlexLamond@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
Kenneth Chew
2f3f4e6056 Adapt theme-color and background-color for different themes 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-06-19 01:02:53 -04:00
Adyanth H
5331620b71 Change tabs to spaces 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-16 10:42:13 +05:30
Adyanth H
23364cfc55 Adding CORS support via environment variable 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-07 16:19:04 +05:30
Adam Warner
1488af490b Merge pull request #1809 from pi-hole/master 
resync Dev with Master
 2021-05-19 21:06:14 +01:00
Sean F Quinn
774f95f3fa Fixes pi-hole/AdminLTE#1796 
Signed-off-by: Sean F Quinn <sean@esqew.com>
 2021-05-06 14:02:09 -04:00
DL6ER
ca71bc8df8 Check if we can get a host name from the database when looking up the MAC address of this client instead 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-29 09:28:12 +02:00
Dylan Sealy
4fc8f283f6 Password autocompletion 
Signed-off-by: Dylan Sealy <66305635+DylanSealy@users.noreply.github.com>
 2021-04-21 22:38:51 +02:00
Adam Warner
937880ebe2 Merge pull request from GHSA-cwwf-93p7-73j9 
use textContent instead ot innerHTML to prevent possible xss attack
 2021-04-14 18:15:35 +01:00
XhmikosR
cf6a59d63f Disable a few xo rules for now. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2021-04-13 19:25:35 +00:00
Adam Warner
5435945f29 Merge pull request #1759 from Yrlish/patch-1 
Trim CNAME target input field value data
 2021-04-12 20:28:08 +01:00
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
187e9ddae6 Merge pull request #1673 from pi-hole/new/gravity_adlist_infos 
Add details to adlist table
 2021-03-17 20:35:40 +01:00
DL6ER
78672fdbec Avoid 1970 date if list was never updated. 2021-03-17 16:55:27 +01:00
Dennis Alexandersson
93464cb9bf Trim CNAME target input field value data 
Signed-off-by: Dennis Alexandersson <dennis@alexandersson.xyz>
 2021-03-06 10:00:32 +01:00
DL6ER
1195920211 Merge pull request #1731 from pi-hole/fix/dark_theme_links 
Add Pi-hole darker theme
 2021-02-28 17:00:52 +01:00
Will Cooke
b69e774bf3 Simple typo fix: static release -> static lease. 
Signed-off-by: Will Cooke <will@whizzy.org>
 2021-02-27 15:02:52 +00:00
Jean-Philippe Doyle
854dab6204 Add update command & documentation link 
Signed-off-by: Jean-Philippe Doyle <jeanphilippe.doyle@hooktstudios.com>
 2021-02-25 00:10:47 -05:00
yubiuser
e045ec3d32 Fix prettier complains 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-02-18 20:24:03 +01:00
yubiuser
cc2030968d Don't count new status types as blocked queries 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-02-17 22:55:27 +01:00
DL6ER
6a4634c185 Merge pull request #1742 from pi-hole/master 
Sync master back to devel
 2021-02-17 11:02:11 +01:00
Jonny Bolton
590749b7eb Typo fixed in save settings 
Signed-off-by: Jonny Bolton <jonnybolton@gmail.com>
 2021-02-16 17:39:39 +00:00
DL6ER
bc108ea834 Add status icon tooltip 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-02-07 11:27:34 +01:00
DL6ER
ba3acbbade Do not create links for file:// adlists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-02-07 11:24:49 +01:00
DL6ER
894ea0a8fa Open adlists in new tabs and allow sorting by status. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-02-07 11:24:42 +01:00