Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,533 Commits 19 Branches 112 Tags
9809cfee9dba3b6c521f25f02727d13a4e5ad98a
Commit Graph

669 Commits

Author SHA1 Message Date
DL6ER
9809cfee9d Merge pull request #1266 from pi-hole/new/diagnostics 
Add new Pi-hole diagnostics system
 2020-05-17 16:35:13 +02:00
V@no
70d2b62382 Fix teleporter to use the 24-hour format. 
Split from #1305

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 16:35:51 +03:00
XhmikosR
6bfc95ff85 Remove unneeded stuff and fix linting 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 16:11:05 +03:00
DL6ER
f591280d58 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-17 16:07:22 +03:00
DL6ER
b0f54f5451 Add new Pi-hole diagnostics page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-17 16:07:21 +03:00
Adam Warner
ee0f9fdf68 Merge pull request #1310 from pi-hole/XhmikosR-patch-2 
Improve user-menu markup
 2020-05-17 13:23:32 +01:00
Adam Warner
61715ffcc2 Merge pull request #1304 from pi-hole/XhmikosR-patch-8 
header: fix `aria-expanded` for user-menu dropdown
 2020-05-17 13:16:36 +01:00
Adam Warner
457ffb2a5d Merge pull request #1302 from pi-hole/xmr-update-fa 
Update Font Awesome to v5.13.0
 2020-05-17 13:12:49 +01:00
Adam Warner
f4722cf2a9 Merge pull request #1263 from pi-hole/xmr-animate-min 
Use the minified animate.css file.
 2020-05-17 13:05:38 +01:00
Adam Warner
0bf2f4e4cc Merge pull request #1300 from pi-hole/XhmikosR-patch-7 
header: Move license header at the top
 2020-05-17 11:16:08 +01:00
Adam Warner
34c9514e07 Merge pull request #1311 from pi-hole/XhmikosR-patch-11 
header: add X-UA-Compatible meta tag
 2020-05-17 11:11:11 +01:00
XhmikosR
acbe0edbd4 header: add X-UA-Compatible meta tag 
For consistency with Bootstrap 3.x.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 11:52:52 +03:00
XhmikosR
725334c93e Improve user-menu markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 11:28:21 +03:00
XhmikosR
d062cb0423 header: fix aria-expanded for user-menu dropdown 
It's not expanded by default, so it needs `aria-expanded="false"`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:53:44 +03:00
XhmikosR
f6bd1a28a2 Use fa-angle-left to see if sidebar transition works 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:55 +03:00
XhmikosR
8283f63c41 Simplify sidebar markup per the latest AdminLTE 2.x demo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:05 +03:00
XhmikosR
db878379ea Update Font Awesome to v5.13.0 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:23:34 +03:00
XhmikosR
b416075cdc header: Move license header at the top 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:16:44 +03:00
DL6ER
6634fb6856 Merge pull request #1288 from pi-hole/tweak/add_domain_behaviour1 
Also do this from the query log page
 2020-05-15 01:18:33 +02:00
Jack'lul
e12ebcbd08 Trim user input where applicable 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2020-05-14 18:01:36 +02:00
Adam Warner
c53436ab3f Also do this from the query log page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-13 23:38:43 +01:00
Adam Warner
ef13e69125 Use REPLACE into instead of INSERT into. This allows for a domain's white/blacklist status to be toggled 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-13 22:01:58 +01:00
XhmikosR
76d50c1897 Use the minified animate.css file. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-13 07:34:16 +03:00
DL6ER
eefbef678c Suppress white 'flashing' on page reloading in dark mode. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
064a0aae9c Use the iCheck library for input box styling. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
a08a85994e Initial (incomplete) support for themes. Currently, the default is the new Pi-hole dark theme. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:52 +02:00
XhmikosR
bfd944e41c Switch to the plain chart.js build and moment.js to v2.24 
This avoids including moment.js twice since chart.js bundle included moment.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-12 23:05:59 +03:00
DL6ER
08d2676489 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 21:14:18 +02:00
DL6ER
257f6ce55e Log number of imported group assignments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:36:00 +02:00
DL6ER
ac3c178ce9 Add import for Local DNS Records. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
67b68b4400 Add pihole-FTL.conf ans custom.list (Local DNS Records) to Teleporter Backup 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
ad4a10c01e Add import for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
cb48efff19 Add export for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
Adam Warner
3d6a54ff97 Add hold-transition to body tag 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 16:33:07 +01:00
Adam Warner
3e94ff0f43 Update adminLTE to 2.4. 
- Change a few references per upgrade guide
 - define colors[] at the top of index.js as AdminLTE.options does not appear to exist. (there may be a better way of doing this)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 12:58:45 +01:00
DL6ER
e96acc415d Merge pull request #1262 from pi-hole/xmr-button-type 
Add `type="button"` to all buttons.
 2020-05-11 22:05:34 +02:00
XhmikosR
8db0957a28 Minor tweaks 
* use the background-color property instead of the background shorthand
* add multiple classes with one `addClass` call
* rename `underline` to `text-underline`
* use the CSS class `pointer` instead of adding CSS via JS
* change `border-color: transparent` to `border: 0` in the navbar right dropdown image
* add image dimensions in the dropdown donate image
* remove the obsolete and unneeded `center` element from network.php
* remove commented out PHP code from header.php
* fix wrong `form-control` class used in buttons

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:49:48 +03:00
XhmikosR
43151d3c43 Add type="button" to all buttons. 
The default is `type="submit"`.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:40:26 +03:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-10 22:00:07 +02:00
Adam Warner
d8706620de Replace paypal link with link to pi-hole.net donate page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-09 12:57:15 +01:00
Adam Warner
6e5bbfb68a Check IP addresses read in from dns-server.conf are valid before adding them to the array. 
Fix for CVE-2020-12620

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-03 22:47:33 +01:00
DL6ER
81a2932f6a Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 21:12:45 +02:00
Dan Schaper
eaf2d7ed62 Merge pull request #1226 from pi-hole/tweak/allow_()_in_urls 
Allow ( and ) in adlist URLs.
 2020-04-28 11:46:32 -07:00
DL6ER
9cf73959fd Rename Custom DNS page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 18:23:13 +00:00
DL6ER
4889350038 Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 17:30:13 +00:00
DL6ER
84046528bf Allow ( and ) in adlist URLs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-26 09:31:45 +02:00
DL6ER
f17b216b6b As of ICU 55.1 (released 2015-04-01) the IDNA2003 APIs are deprecated, because UTS #46 should be preferred over the obsolete IDNA 2003 variant. Implement this change. Fixes #1223 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-25 07:02:37 +02:00
DL6ER
77b421b133 Show how many domains have been added in case of an error. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 13:47:50 +02:00
DL6ER
7d1163ff9c Try to be clearer with the "failed to add domain" message by showing the original input when idn_to_ascii() failed and by showing both, the original and the converted domain when the conversion result itself is invalid. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 11:39:57 +02:00