Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-26 03:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,938 Commits 23 Branches 114 Tags
5624834175fb68e333b2e0d9e4e1d86953776ec9
Commit Graph

791 Commits

Author SHA1 Message Date
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
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
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
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
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 22:24:17 +02:00
Adam Warner
efd9281fa4 Merge pull request #1442 from pi-hole/fix/null_comments_in_groups 
Store NULL for empty descriptions and comments in the groups database tables
 2020-06-05 19:17:57 +01:00
Adam Warner
7aa79a7a77 Merge pull request #1420 from pi-hole/tweak/improve_warnings 
Improve messages on the domain management pages
 2020-06-05 19:17:17 +01:00
DL6ER
a7bc6e8999 Store NULL for emtpty descriptions and comments in the groups database tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 11:53:10 +02:00
XhmikosR
9aa11ec6aa Fix typo "Long term" -> "Long-term" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 19:01:10 +03:00
XhmikosR
a9cee0039a Improve CSP config (#1377) 
* Remove `'unsafe-eval'`; this was needed in the past for Chart.js.
* Remove `https://api.github.com` since we don't make any requests to this domain client-side
* Specify more directives which are not inherited by `default-src`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 17:40:39 +03:00
DL6ER
c6abbac3e1 Unlike the standard PHP engine, others might actually be case-sensitive. (#1428) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 15:13:15 +03:00
DL6ER
540ebddb8c Merge branch 'devel' into new/rev-server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:24:49 +02:00
Adam Warner
981cba14f2 Use PHP builtin to split the input by space. Automatically takes into account " chars 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 16:50:33 +01:00
DL6ER
a4a678b584 Revert "Add per-browser boxed layout setting" 
This reverts commit c2683fb87bc50369753b279e179e7b5d0d1e60a9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
51dc473278 Remove saving backend for settings moved into local storage. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
2e0a261c47 No not use per-browser settings for the theme to avoid flashing pages on navigation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
3c793581b7 Add per-browser temp unit selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00