Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-22 19:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

744 Commits

Author SHA1 Message Date
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
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
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
DL6ER
6e52ee4307 Add per-browser theme selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:18:36 +01:00
DL6ER
3124e94d5a Fix login page check box 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
7ff5764f95 Add per-browser boxed layout setting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
0e4d1e4e7f Implement per-browser checkbox and radio button styling using icheck-material. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
580149e91f Merge pull request #1292 from pi-hole/tweak/group_name_separators 
Allow spaces in groups when wrapping names in "..."
 2020-06-02 13:43:49 +02:00
DL6ER
d518a1d43d Merge pull request #1417 from pi-hole/include-hostname-in-backup 
Include hostname in backup filename
 2020-06-02 13:40:13 +02:00
DL6ER
332cff1d36 Improve warnings on the domain management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 11:37:23 +02:00
Adam Warner
ee89ab3131 Include hostname in backup filename. Will add nothing if no hostname detected. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 20:49:31 +01:00
Chris Coffin
4cca206810 Change "Permanently" toggle to "Indefinitely" (#1416) 
* Changing "Permanently" toggle to "Indefinitely"

Signed-off-by: Chris Coffin <me@chriscoffin.org>

* Updating ID name in footer.js

Signed-off-by: Chris Coffin <me@chriscoffin.org>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 21:47:33 +03:00
XhmikosR
e9fc5a20ca Revert "header: Move license header at the top" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-31 15:56:10 +03:00
Adam Warner
89ce5d139b Merge pull request #1405 from pi-hole/fix-sidebar 
Fix sidebar docs link
 2020-05-30 15:36:18 +01:00
Adam Warner
be54d1563d Merge pull request #1402 from pi-hole/XhmikosR-patch-3 
Move animate.min.css style in the pages that use it
 2020-05-30 15:35:09 +01:00
XhmikosR
ee40ea3d36 Fix sidebar docs link 
Also work around us using Font Awesome 5.x with AdminLTE 2.x.

We should fix the FA classes later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:16:09 +03:00
XhmikosR
4e5cc31134 Move animate.min.css style in the pages that use it 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:28:45 +03:00
XhmikosR
876e7d8bd9 Use minified daterangepicker builds. 
The official distribution doesn't include minified files, so just minify the files ourselves.

It's in maintenance mode anyway.

Commands for future reference:

* cleancss --compatibility ie9 -O1 specialComments:0 -o daterangepicker.min.css daterangepicker.css
* terser daterangepicker.js --compress typeofs=false --mangle --source-map url=daterangepicker.min.js.map -o daterangepicker.min.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:26:44 +03:00
Adam Warner
a284f71bd7 Merge pull request #1389 from pi-hole/js-move 
Move JS files where they are used.
 2020-05-29 23:39:51 +01:00
Adam Warner
7700d9b44a Merge pull request #1387 from pi-hole/new/api_add_sub_get_lists 
(Re-)Add API endpoints for list manipulations
 2020-05-29 23:30:40 +01:00
DL6ER
7abeb2b434 Merge pull request #1404 from pi-hole/been-a-while-since-we-touched-this 
remove outdated local help page, link to docs instead
 2020-05-29 23:15:58 +02:00
Adam Warner
0d7040921e Merge pull request #1361 from pi-hole:rm-jquery-ui 
Remove the unused jQuery UI.
 2020-05-29 21:42:16 +01:00
Adam Warner
1390a6dd5a remove outdated local help page, link to docs instead 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-29 21:41:11 +01:00
DL6ER
e213dce308 Merge pull request #1394 from pi-hole/ren-fa-folder 
Remove version number from the Font Awesome folder.
 2020-05-29 22:10:25 +02:00
XhmikosR
2b93d569dd Move the gethostname() call to a variable. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:49:51 +03:00
XhmikosR
f1eb744ff5 Guard gethostname() calls 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:24:07 +03:00
XhmikosR
95219703a1 Remove the unused jQuery UI. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 08:31:06 +03:00
XhmikosR
469d491260 Move JS files where they are used. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 07:43:13 +03:00
XhmikosR
f5d68ffd88 Remove version number from the Font Awesome folder. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 09:22:37 +03:00
DL6ER
cce92ccde4 Remove obsolete add.php script, use groups.php everywhere instead. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 23:07:20 +02:00
Adam Warner
c2a634f80f Allow for ; in adlist urls 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-26 20:58:18 +01:00
DL6ER
2fac217943 Re-implement api.php?list actions for add, sub and get. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 18:40:33 +02:00
DL6ER
a4f9068b32 Merge pull request #1368 from pi-hole/sidebar-toggle 
Use `fa5` class on the sidebar toggle
 2020-05-25 20:36:19 +02:00
XhmikosR
36eb877a31 Tweak footer.php 
* add a new row for the version info
* add links to the current tags
* make the updates URLs go to the latest GitHub release
* color the heart icon red
* remove "Version" from links; the tags are prefixed with "v"

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 21:22:18 +03:00