Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-28 05:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,054 Commits 24 Branches 113 Tags
012116a58d231ca7ec2488b3aa8aab41cd7f62a8
Commit Graph

807 Commits

Author SHA1 Message Date
DL6ER
012116a58d Merge pull request #1672 from pi-hole/fix/groups_backend 
Bugfix allowing to effectively set empty domain/client/adlist groupsets
 2021-01-13 21:28:20 +01:00
DL6ER
9b19104ae6 Merge pull request #1654 from buchwasa/phpstan-fixes 
Fixes in func.php from phpstan
 2020-12-31 11:59:23 +01:00
DL6ER
ba1ac8621f Use empty array for foreach() when no group is to be set, always commit when editing domains, and report any errors while commiting. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-28 07:57:58 +01:00
DL6ER
564a4838ae Fix transactions in groups.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-23 15:21:57 +01:00
yubiuser
42e7915b53 Fix typo 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-12-20 20:35:21 +01:00
yubiuser
c07b710d07 Validate target domain for CNAME records 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-12-20 20:26:37 +01:00
buchwasa
98e6a45242 Fixes in func.php from phpstan 
Signed-off-by: buchwasa <17461354+buchwasa@users.noreply.github.com>
 2020-12-10 16:51:42 -05:00
DL6ER
ad5679ae70 Merge pull request #1619 from notriddle/master 
Switch from fontawesome webfonts to SVG + JS
 2020-12-10 22:24:11 +01:00
Aidan Woods
85c7a3b437 Use hash_equals when comparing to pwhash from cookie 
This should prevent a timing attack against this parameter to
disclose the stored passsword hash.

Signed-off-by: Aidan Woods <aidantwoods@gmail.com>
 2020-12-06 13:26:02 +00:00
Adam Warner
483f5037db Merge pull request #1625 from pi-hole/tweak/replace_domains 
Add new replace_domain action to allow adding domain(s) exclusively to a specific list
 2020-11-28 16:25:38 +00:00
DL6ER
c8b85b8596 Use INSERT OR IGNORE instead of REPLACE 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-10 21:26:01 +01:00
DL6ER
ad43e5a8dc Add missing space and extend error hiding timeout from 4 to 10 seconds. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-09 21:21:30 +01:00
DL6ER
4557846858 Use JOIN instead of nested SELECT 
Signed-off-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-09 21:17:26 +01:00
DL6ER
f5a39ce1e4 Check if replacing the domain messes with existing special groups settings. Don't change it but show a warning if this is the case. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-08 22:52:03 +01:00
DL6ER
90c9ebc54b Ensure empty clients/groups/adlists/audits cannot be added 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-08 22:06:30 +01:00
DL6ER
0e924fd910 Add new replace_domain action in groups.php to allow adding domain(s) exclusively to a specific list. In this mode, any occurrences of said domain are first removed from the list before adding the new ones. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-08 18:51:49 +01:00
Michael Howell
5624834175 Switch from fontawesome webfonts to SVG + JS 
https://discourse.pi-hole.net/t/use-svg-for-icons-instead-of-font/40166

Signed-off-by: Michael Howell <michael@notriddle.com>
 2020-11-05 16:49:22 -07: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
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
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
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
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
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
yubiuser
c15a8ecde2 Add 'seconds' to custom disable timeout modal 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-08-03 11:42:41 +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
DL6ER
0865123914 Merge pull request #1518 from pi-hole/fix/audit_log 
Fix audit log button
 2020-07-30 21:49:59 +02:00
DL6ER
4e8584a771 Merge pull request #1514 from pi-hole/fix/arpflush 
Fix ARPFLUSH button on the settings page
 2020-07-21 12:52:25 +02:00
DL6ER
fdea341c9f Fix audit log button doing nothing (resp. wrongthing) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 22:04:59 +02:00
DL6ER
8672c49b4b Replace "." by "_" in hostnames to work around a PHP Phar bug. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 21:43:44 +02:00
DL6ER
99adb3012b Fix arpflush command 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-19 22:13:05 +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
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
XhmikosR
085a0e2e99 Fix HTML validation errors in header.php 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-16 08:11:53 +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
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
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
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
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