Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 02:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,239 Commits 23 Branches 114 Tags
cd887a2c32717f2917f49e4eae8a1ea743292f68
Commit Graph

1056 Commits

Author SHA1 Message Date
Adam Warner
34f6c753c7 Merge pull request #1350 from pi-hole/cookies-delete 
Properly delete the `persistentlogin` cookie
 2020-05-23 08:51:31 +01:00
Adam Warner
71547422ec Merge pull request #1347 from pi-hole/improve-user-info-markup 
Improve user info markup
 2020-05-23 08:49:36 +01:00
Adam Warner
8c3ad9a1b9 Merge pull request #1335 from pi-hole/datatables 
Load the built DataTables bundle
 2020-05-23 08:08:17 +01:00
Adam Warner
ef545a2f89 Merge pull request #1334 from pi-hole/mv-files 
Move non-Bootstrap files outside of the bootstrap folder
 2020-05-23 08:04:46 +01:00
XhmikosR
3dc8d9c5e3 Properly delete the persistentlogin cookie 
The previous solution did not delete the cookie.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-22 16:23:46 +03:00
XhmikosR
442201d613 Improve user info markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-22 11:21:43 +03:00
Matthias rank
212da94228 Added token verification 
Moved CNAME functions to func.php
Added teleporter support
Fixed CNAME and DNS file declaration (filename was declarated in seperate file, therefore trying to read those files from func.php failed)
Fixed error and success response functions in func.php (calling addCustomDNSEntry and addCustomCNAMEEntry repeatedly from teleporter failed because of error function defined inside of those functions)

Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-21 14:48:13 +02:00
Adam Warner
7b2d396295 require auth for the customDNS page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-20 08:26:21 +01:00
XhmikosR
9d9cd8b7e6 Load the built DataTables bundle file. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-19 21:58:09 +03:00
XhmikosR
7ad275e1fd Move non-Bootstrap files outside of the bootstrap folder 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-19 16:31:25 +03:00
DL6ER
ac89d268a7 Only try to implode pihole arpflush quiet output if it is an array. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-19 11:23:42 +02:00
Adam Warner
dd599ad08d Merge pull request #1323 from pi-hole/XhmikosR-patch-7 
header.php: minor cleanup
 2020-05-18 19:12:50 +01:00
Adam Warner
89baa0b532 Merge pull request #1320 from pi-hole/XhmikosR-patch-2 
header.php: group stylesheets and scripts
 2020-05-18 19:10:18 +01:00
Adam Warner
84dd58e03e Merge pull request #1319 from pi-hole/XhmikosR-patch-4 
Use `text-uppercase` in sidebar
 2020-05-18 19:08:26 +01:00
Adam Warner
dd6b47e835 Merge pull request #1309 from pi-hole/XhmikosR-patch-3 
Improve navbar's hostname markup
 2020-05-18 19:07:38 +01:00
Adam Warner
e3cd70dcb3 While I'm in here.. prevent another error being constantly output to the error log 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-18 18:09:23 +01:00
Adam Warner
2633cbace6 Remove an error log output that was presumably leftover from debugging 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-18 17:00:52 +01:00
DL6ER
090e55ef99 Use host names stored in the network_addresses table when querying new client suggestions. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-18 14:29:41 +02:00
XhmikosR
b7fd000cef header.php: minor cleanup 
* remove unneeded inline styles
* use `strong` instead of `b`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 10:27:45 +03:00
XhmikosR
0029b3fccb header.php: group stylesheets and scripts 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 09:23:39 +03:00
XhmikosR
c66599c1b8 Use text-uppercase in sidebar 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 22:14:57 +03:00
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
XhmikosR
30b8c5f383 Improve navbar's hostname markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 17:20:48 +03: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
dca347c056 Fix missing separator when there is vendor and address but no hostname 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 18:44:12 +02:00
DL6ER
7a5235512b Order suggested clients by firstSeen (most recent on top). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 18:44:11 +02:00
Matthias Rank
e380d9222a Removed already defined functions 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-15 10:09:15 +02: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
DL6ER
f7647c9c6d Show hostname(s) first, then MAC vendor (if applicable) and then IP address(es). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 00:00:36 +02:00
DL6ER
29e048824e Ensure we're not adding IPs for mock devices. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 23:58:24 +02:00
DL6ER
389f1d1ecd Fix failed git auto-merge. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 20:29:42 +02:00
DL6ER
8a794bf9aa Also show IP addresses in MAC details 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 20:13:49 +02:00
DL6ER
fe10059517 Finalize sub-queries to ensure we're not running out of memory with hundreds of clients (can result in O(N^2) memory requirements). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:43:35 +02:00
DL6ER
8c53844ef3 Add device vendor (if available) to info string shown in the select dropdown 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:43:35 +02:00