Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-19 08:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,254 Commits 24 Branches 114 Tags
5d16e2c44a2cf4e6e4e90ffa6525f4d24b7be307
Commit Graph

2898 Commits

Author SHA1 Message Date
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
e7a4068003 Bugfix: Sorting algorithm of DataTables is broken, use Momentum.js for filtering 2017-03-03 16:13:59 +01: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
fff84276db Merge pull request #408 from pi-hole/new/FTL-integration 
FTL
 2017-03-03 13:41:41 +01:00
DL6ER
40fd8b8b1d Add IPv6 upstream servers 2017-03-02 22:38:38 +01:00
DL6ER
7729eea48d Start count down only if there is something to count down 2017-03-01 14:12:13 +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
DL6ER
276f2c1628 Allow usage of Teleporter and QueryAds backend only if a valid session is detected (#415) 2017-02-27 22:32:03 +01:00
DL6ER
f328595d6d Remove [ ] from SERVER_NAME variable (#405) 2017-02-27 22:17:46 +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
Dan Schaper
5a19394977 Add undocumented -w flag to alter the countdown behavior. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 11:12:18 -08:00
DL6ER
aacc215394 Some simplifications + center 10min interval data in the middle instead of the beginning of the corresponding interval 2017-02-27 17:20:12 +01:00
DL6ER
9fec6bb7fb Necessary changes doe to commit 85a7818e7996b44b15d51af26ecf165e672d616b 2017-02-27 15:42:50 +01: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
9471594bdf Move tailLog function into own file 2017-02-23 15:12:23 +01:00
DL6ER
874ec8c9db Implemented tailLog into FTL API 2017-02-23 15:03:53 +01:00
DL6ER
ab974f3f03 Disable checkbox after starting generation of debug log since the action can not be changed afterwards 2017-02-23 12:22:03 +01:00
DL6ER
20ce214c9f Add checkbox if the user wants his debug log to be uploaded automatically 2017-02-22 19:47:58 +01:00
DL6ER
71672319af Another codacy commit 2017-02-22 18:07:12 +01:00
DL6ER
c99f23c995 Codacy 2017-02-22 17:35:31 +01:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
DL6ER
4cc917dd91 Codacy 2017-02-22 15:07:02 +01:00
DL6ER
081d8f35c6 Merge branch 'devel' into new/FTL-integration 
Conflicts:
	api.php
 2017-02-22 12:19:10 +01:00
DL6ER
d1ed5652a8 Another small change to ensure the remining line endings are also gone 2017-02-20 23:11:38 +01:00
Adam Warner
81ed75eb84 same thing on gravity.sh.php 2017-02-20 21:43:37 +00:00
Adam Warner
94539d3952 whitespace in licence header causing issues with query adlists page 2017-02-20 21:41:55 +00:00
DL6ER
d7fdaf9273 Fix whitespace caused by added license headers 2017-02-19 21:19:02 +01:00
DL6ER
dc61eb82d4 Show summary if no arguments are passed to API 2017-02-19 19:10:49 +01:00
DL6ER
8a0839f439 Small security update to the indicidual API files 2017-02-19 19:05:06 +01:00
DL6ER
91c563692e Codacy 2017-02-19 14:58:20 +01:00