Commit Graph

3238 Commits

Author SHA1 Message Date
8633brown 8d60ef30f5 only print hostname in title if gethostname function returns a valid hostname
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 22:16:05 -07:00
8633brown 908c24c6c5 Add "-" separator between title and hostname
Co-Authored-By: Dan Schaper <dan@glacialmagma.com>
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 21:57:42 -07:00
8633brown 5676ca6e3d resolve change request
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-12 13:40:44 -07:00
8633brown 84f635296c add gethostname function to html title
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
2020-02-11 18:48:19 -07:00
Adam Warner 519e2771f1 Merge pull request #1124 from pi-hole/master-xmr-fa
Switch to using Font Awesome
2020-02-08 12:31:07 +00:00
DL6ER 60b078b4a0 Merge pull request #1131 from Smarre/parse_port_from_config
FTL.php: parse port path from pihole-FTL.conf
2020-01-19 15:38:37 +01:00
Samu Voutilainen b7e9bd492c Use piholeFTLConfig() to resolve pihole-FTL.conf contents
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
Samu Voutilainen e70b9305bb Whitespace cleanup
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
Samu Voutilainen ab04607087 FTL.php: parse port path from pihole-FTL.conf
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
DL6ER d9336c3714 Merge pull request #1132 from pi-hole/devel-token-text
Use `text()` for token.
2020-01-19 14:29:07 +01:00
XhmikosR dee16f6c7a Switch to using Font Awesome
This should be more consistent.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-19 13:53:48 +02:00
XhmikosR 0f0820dae4 Use text() for token.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-19 13:49:46 +02:00
Dan Schaper 5eadd346b9 Merge pull request #1109 from alucic/patch-1
Fix AdminLTE link
2020-01-09 09:23:27 -08:00
DL6ER 58ec964f10 Merge pull request #1128 from pi-hole/logo-link
Change logo link to point to the dashboard.
2020-01-08 19:31:02 +01:00
XhmikosR 0ed702197a Change logo link to point to the dashboard.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-08 18:36:11 +02:00
Adam Warner 8731be81a0 Merge pull request #1123 from pi-hole/XhmikosR-patch-3
Remove unused function isMobile()
2020-01-04 16:12:13 +00:00
Adam Warner b447d526d9 Merge pull request #1104 from pi-hole/fonts
Move fonts to the header.php
2020-01-04 16:09:43 +00:00
Adam Warner 7d1e5ebf6e Merge pull request #1122 from pi-hole/fix/db_graph_links
Fix generated long-term graph links
2020-01-03 12:57:55 +00:00
DL6ER 81d7d24910 Use correct interval for the database query when clicking on one of the long-term graph bars.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-03 14:50:48 +02:00
XhmikosR 793a6ec49f Remove unused function isMobile()
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-03 14:49:41 +02:00
Adam Warner 0a16b94ca6 Merge pull request #1080 from pi-hole/xo
Switch to xo + prettier
2020-01-03 12:40:04 +00:00
XhmikosR d29ac3aa63 Add GitHub Actions CI support.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-02 19:42:19 +02:00
XhmikosR b74f0f3969 Fix the remaining lint issues
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-02 19:42:19 +02:00
XhmikosR 704c352277 Format JS code
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-02 19:42:18 +02:00
XhmikosR 3321fa8067 Add xo.
Use prettier for formatting.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-02 19:42:16 +02:00
Adam Warner 4fbec2a557 Merge pull request #1112 from pi-hole/scrollY
`window.scrollY` isn't supported on IE
2020-01-02 17:34:02 +00:00
Adam Warner c376962da5 Merge pull request #1114 from pi-hole/padStart
Replace padStart with a solution that works in older browsers
2020-01-02 17:30:52 +00:00
Adam Warner aff834448a Merge pull request #1113 from pi-hole/length
length cannot be negative
2020-01-02 17:30:25 +00:00
Adam Warner fe45538fc2 Merge pull request #1111 from pi-hole/license-headers
Add license headers.
2020-01-02 17:28:31 +00:00
Adam Warner 701de94be8 Merge pull request #1110 from pi-hole/var
Switch back to var
2020-01-02 17:28:08 +00:00
Adam Warner 73236e8ada Merge pull request #1094 from pi-hole/buttons
Fix buttons appearance
2020-01-02 17:26:28 +00:00
Adam Warner ab629c52a1 Replace padStart with a solution that works in older browsers
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-29 10:17:55 +02:00
XhmikosR 25af37509e length cannot be negative
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-29 10:13:50 +02:00
XhmikosR 6e55b4f827 window.scrollY isn't supported on IE
Replace it with `window.pageYOffset`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-29 10:12:09 +02:00
XhmikosR 2c315cec4a Add license headers.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-29 10:08:31 +02:00
XhmikosR e91d0b0cfa Switch back to var
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-29 10:07:01 +02:00
Ante Lucic b9dcf3d4aa Fix AdminLTE link
https://almsaeedstudio.com redirects to https://adminlte.io/ and has expired SSL cert
Signed-off-by: Ante Lucic <ante.lucic450@gmail.com>
2019-12-29 00:40:04 -05:00
DL6ER 03b3a1d604 Merge pull request #1088 from pi-hole/location
Be explicit about `window.location`
2019-12-28 16:58:27 +01:00
DL6ER 132c69b79e Merge pull request #1099 from pi-hole/tweak/customDNS_page
Tweak Custom DNS page
2019-12-28 16:55:43 +01:00
DL6ER 250457abc3 Merge branch 'devel' into tweak/customDNS_page 2019-12-28 16:47:42 +01:00
DL6ER 306b0b94a9 Merge pull request #1098 from pi-hole/tweak/graphs
Change over-time graphs from line to stacked bar representation
2019-12-28 16:46:41 +01:00
DL6ER f96bbcb37f Merge pull request #1102 from pi-hole/fix/domains_lower_case
Ensure added domains are lower-case.
2019-12-28 16:46:09 +01:00
DL6ER de8ead6a91 Merge pull request #1106 from pi-hole/tweak/teleporter-etc-hosts
Add /etc/hosts to teleporter export.
2019-12-28 16:45:25 +01:00
DL6ER b07d290a91 Merge pull request #1076 from pi-hole/new/group-management
Add group management
2019-12-28 16:45:18 +01:00
DL6ER c81d690be4 Add /etc/hosts to teleporter export.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-28 13:30:57 +00:00
DL6ER 9b7daa324a Do not go back to page 1 when deleting an item.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-28 13:21:53 +00:00
XhmikosR cee3d536bc Move fonts to the header.php
`@import` is discouraged because it's blocking.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-26 18:00:21 +02:00
DL6ER b840d2103b Do not reload table on successfull edits and deletions.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-23 15:38:59 +00:00
DL6ER a80355cf2f Improve error messages.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-23 15:19:52 +00:00
DL6ER cce7c928d5 We have to get the group's ID from the hidden field now that we removed/hide the IP column by default.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-23 15:13:51 +00:00