Commit Graph

54 Commits

Author SHA1 Message Date
DL6ER
a3e375f92b Add version info to dropdown menu (top right) for viewing on small screens. Addresses #333 partially 2017-06-03 16:40:29 +02:00
DL6ER
2f218ba9eb Major overhaul of update checker - checks only every 30 minutes to reduce number of GitHub API requests 2017-06-03 16:40:25 +02:00
DL6ER
bbe0ff4984 Merge pull request #511 from Th3M3/links_in_new_tab
open links up in new tab
2017-05-24 16:35:38 +02:00
TheME
d3fe10152f select 'Login' in Navbar when showing loginpage
using the same term as it is already used to show up the loginpage (in line 565)
2017-05-21 20:38:03 +02:00
TheME
6cf92c10ac Update header.php 2017-05-19 20:47:29 +02:00
TheME
eed6c4590f open links in new tab 2017-05-19 20:04:01 +02:00
Adam Warner
768196060e Embolden the hole. 2017-04-27 18:34:59 +01:00
DL6ER
b3cbd29ed7 Don't rely on PID file, but try to detect FTL PID ourselves (has shown to be very effective in the update service file) 2017-04-20 13:20:36 +02:00
Mcat12
21bd036af6 Merge remote-tracking branch 'origin/devel' into fix/csrf-security 2017-04-04 20:40:31 -04:00
DL6ER
7e68fdecff Make sure license comment is only outputted after header.php has prepared all the stuff that need to be done beforehand. Fixes #450 2017-04-03 10:17:05 +02:00
Mcat12
d956c35c24 Expose a CSRF token when logged in 2017-04-02 19:20:05 -04:00
DL6ER
ebef61614d Handle FTL offline notification and instant refresh when it becomes available 2017-03-24 15:57:44 +01:00
DL6ER
540cc8208e Merge pull request #448 from pi-hole/tweak/pihole-case
Change capital "H" to lower
2017-03-17 08:02:06 +01:00
Jacob Salmela
a540e2d320 change H to lowercase to match brand 2017-03-16 20:55:37 -05:00
DL6ER
9ef02a6fbc Merge pull request #433 from pi-hole/new/tail-FTLlog
Add tail pihole-FTL.log
2017-03-16 23:23:03 +01:00
DL6ER
a8deaddc5e Improve FTL information box on the Settings page 2017-03-07 16:45:22 +01:00
DL6ER
23334b3dbd Add tail pihole-FTL.log 2017-03-05 23:17:34 +01:00
Barisi
2653e52fc8 Added thin space between memory usage reading and unit(%) 2017-03-05 17:55:42 +00:00
Barisi
5f4578738f changed whitespace to non-breaking space 2017-03-04 12:59:14 +00:00
Barisi
04a9987cb9 Added space between temperature reading and unit 2017-03-03 23:28:58 +00:00
DL6ER
8cca0b96e4 Merge branch 'devel' into new/FTL-integration 2017-03-01 00:05:11 +01:00
DL6ER
a2f2fbfccf Show info text 2017-02-28 23:59:24 +01:00
DL6ER
220b31a714 Try to derive number of cores from /proc/cpuinfo if nproc is not available 2017-02-28 23:51:58 +01:00
DL6ER
107ae02887 Round load display to precision two 2017-02-28 23:41:03 +01:00
DL6ER
7a73053bfd Merge branch 'devel' into new/FTL-integration
Conflicts:
	api.php
2017-02-28 13:49:34 +01:00
Dan Schaper
110ab455b6 Merge pull request #399 from pi-hole/new/OnlineDebug
Added online debug log creator
2017-02-27 12:30:48 -08:00
Adam Warner
0abee8efb6 Merge pull request #412 from pi-hole/tweak/customDisableTimeGlovalCountdown
Show disable timer across all devices
2017-02-24 10:42:18 +00:00
Jacob Salmela
c4cdcd9e94 change verbiage Main Page to Dashboard 2017-02-23 11:35:58 -06:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
DL6ER
f88092175e Conflicts:
api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
2017-02-19 14:17:52 +01:00
Adam Warner
80ad3bac4d Merge pull request #406 from pi-hole/customDisable
Custom disable time
2017-02-19 02:02:31 +00:00
DL6ER
4f70973cbc EUPL license (#402)
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
2017-02-18 14:20:51 +01:00
Promofaux
18d914322b add an id to the label that gets updated 2017-02-18 00:43:50 +00:00
Promofaux
0e9976902b new button 2017-02-17 20:47:28 +00:00
DL6ER
aabff35bef Squashed commit of the following:
- Dynamically fall back to PHP API functions to ensure API does always repond even if FTL is not runnung for some reason
- Update PHP API from current devel branch
- Increase flexibility in getQueryTypes API call
- Hide top ads list if nothing to display
- Proper display of activated privacy mode
- Remove spinner (would otherwise not be removed for zero results)
- Update tables every 10 seconds
- Update query types and forward destinations plots every 10 seconds
- More verbose output in top lists (total number next to percentage in tooltip)
- Implemented "recentBlocked" keyword for API
- Ensure compatibility with PHP5 version < 5.4
- Adjust output format of overTimeData10mins to comply with PHP API
- Further speedup of Query Log page by showing only the recent 10 minutes by default
- Hide temperature if FTL is not running and show FTL status
- Add information to Settings page
- Adjust error message when loading of query log failed
- Move processing of domainname, clientIP, clientname and time interval filters for the Query Log page to FTL for speed enhancement
- Generate link if pi.hole comes up in the Top Domains list
- Remove resolve DNS names option - this is now enabled by default (daemon will only do it once per day instead of PHP-API which did it on every reloading of the web interface)
- Add socket timeout of 10 seconds + modification to Settings page since FTL backend supports API_EXCLUDE_CLIENTS filtering with both IP addresses and host names (also mixed)
- Improved Query Log page
2017-02-16 08:52:30 +01:00
DL6ER
1c73016f6a Modified scripts in scripts/pi-hole/php 2017-02-14 15:00:11 +01:00
DL6ER
9765b38ec2 Added online debug log creator 2017-02-10 12:22:59 +01:00
DL6ER
8ff6c77ad4 Make statistics not selectable 2017-01-12 17:15:13 +01:00
Mcat12
bac5bd7fcd Preserve <a> but take off href
Need the styling provided by <a>
2017-01-07 19:03:37 -05:00
Promofaux
f53ea25bd4 These don't need to be links 2017-01-07 22:40:04 +00:00
Mcat12
ed496afc1e Do not hide the session info
The JS will handle that
2017-01-07 14:10:42 -05:00
Mcat12
7765eeea34 Only show token when authorized 2017-01-06 10:53:01 -05:00
Mcat12
23149709db Merge pull request #327 from pi-hole/tweaks
Tweaks for the webUI
2017-01-03 17:26:20 -05:00
DL6ER
9221d8a5e7 Avoid double " 2017-01-03 13:44:24 +01:00
DL6ER
ae9a2ad616 Fix responsive icon on Gecko engine (Firefox + derivatives) 2017-01-03 10:57:39 +01:00
DL6ER
1438a9d71a Display which page will be shown when hitting Return + Logout always goes to the very same URL 2017-01-02 17:13:54 +01:00
DL6ER
06cc3ca550 Logout -> Go to Settings page instead of Main page (will show log in page again) 2017-01-02 16:33:27 +01:00
DL6ER
72246d47c9 Merge branch 'devel' into fix/status 2016-12-30 20:35:43 +00:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
DL6ER
e5a9826078 Moved more private files out of the root directory 2016-12-21 21:10:21 +01:00