Commit Graph

280 Commits

Author SHA1 Message Date
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
gedetil
08f40722c1 Update savesettings.php
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page.  Useful for doing clean shutdown before powering off.

Gilbert Detillieux <gedetil> 2017-04-11
2017-04-11 13:44:18 -05:00
Mcat12
52a5fb62ff Merge pull request #466 from pi-hole/fix/csrf-security
Add CSRF token
2017-04-06 16:22:18 -04:00
Mcat12
acc83345fd Merge pull request #252 from pi-hole/customizeadlists
Manage adlists
2017-04-06 16:16:05 -04:00
Patrick O'Brien
cd4b25ceec update change password examples 2017-04-05 12:40:35 -04:00
Mcat12
1e748446df Require CSRF token for Teleporter 2017-04-04 21:02:48 -04: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
fe7f3d3873 Require CSRF token when changing settings 2017-04-02 20:04:39 -04:00
Mcat12
4d9d9dc949 Require CSRF token for debug log generation 2017-04-02 19:23:03 -04:00
Mcat12
d956c35c24 Expose a CSRF token when logged in 2017-04-02 19:20:05 -04:00
Mcat12
7a5c8e899e Use button to remove lists 2017-03-31 20:16:58 -04:00
Mcat12
86d8869867 Handle deletion of list in savesettings.php 2017-03-31 18:42:00 -04:00
Adam Warner
c11172d7c4 modify to work with changes in pihole#1365 2017-03-31 21:05:53 +01:00
DL6ER
f8d9d9dcf1 Merge pull request #460 from flokX/devel
Match the Pi-hole brand
2017-03-28 22:17:21 +02:00
Flo
146184824f Update savesettings.php 2017-03-26 14:56:21 +02:00
Flo
61870cf342 Update loginpage.php 2017-03-26 14:55:40 +02:00
DL6ER
30b7b0d63a Show FTL version and update notification (if available) in footer 2017-03-26 13:42:29 +02:00
Mcat12
108f7f34fe Merge pull request #454 from pi-hole/fix/dns-servers-undefined-var
Fix undefined variable when setting DNS servers
2017-03-24 19:11:34 -04:00
DL6ER
ebef61614d Handle FTL offline notification and instant refresh when it becomes available 2017-03-24 15:57:44 +01:00
Mcat12
c182834e55 Fix undefined variable when setting DNS servers 2017-03-21 18:35:32 -04:00
Anthony Giorgio
44d5b9653e Fix spelling 2017-03-18 08:05:06 -04: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
Mcat12
12d56dee13 Change padlock to key in login page 2017-03-16 17:37:30 -04:00
Skittels
7627f35ba5 Update savesettings.php 2017-03-14 20:21:57 +01:00
DL6ER
8a4861c194 Merge pull request #439 from pi-hole/fix/queryads
Allow block page to access queryads
2017-03-10 14:44:56 +01:00
Mcat12
f7420d2786 Merge pull request #432 from pi-hole/tweak/teleporter
Some tweaks for the Pi-hole Teleporter
2017-03-10 14:42:49 +01:00
Mcat12
667acb90ca Allow block page to access queryads
Broken in 276f2c1628
2017-03-10 07:27:27 -05:00
DL6ER
a8deaddc5e Improve FTL information box on the Settings page 2017-03-07 16:45:22 +01:00
Mcat12
1b64678b7f Merge pull request #429 from barisi/devel
Added space between temperature reading and unit
2017-03-06 20:12:40 -05: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
DL6ER
39e76afd62 Allow generation of ZIP file via command line 2017-03-05 14:03:37 +01:00
DL6ER
c034798f61 Export also all files found in /etc/dnsmasq.d 2017-03-05 13:54:43 +01:00
DL6ER
e695f490c0 Add datetimestamp to downloaded filename (e.g. "pi-hole-teleporter_2017-03-05_01-37-52.zip") 2017-03-05 13:38:06 +01: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
41cadc5b48 Merge pull request #423 from pi-hole/new/IPv6upstreamDNSservers
Add IPv6 upstream server settings
2017-03-03 14:43:48 +01:00
DL6ER
4182a83bd4 Codacy and styling 2017-03-03 14:39:51 +01:00
DL6ER
40fd8b8b1d Add IPv6 upstream servers 2017-03-02 22:38:38 +01:00
DL6ER
57d62879bc Merge branch 'devel' into new/FTL-integration 2017-03-01 12:44:51 +01:00
DL6ER
6cef1b3085 Setup interface listening behavior of dnsmasq 2017-03-01 11:25:28 +01: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
DL6ER
d104539708 API QR token generator (#410)
* Added API QR token generator

* Pass only token

* Corrected link
2017-02-27 22:33:35 +01:00