Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-26 20:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,864 Commits 23 Branches 113 Tags
d64c0aa48fee18fd330e0a3cd96afff8b16cc76b
Commit Graph

232 Commits

Author SHA1 Message Date
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
DL6ER
01283cc7d5 Ensure fallback solution works for all emelemts on the main page 2017-02-19 14:50:04 +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
Promofaux
86880668fa Add DNS.WATCH servers from https://github.com/pi-hole/pi-hole/pull/1253 2017-02-18 17:51:15 +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
a6439d8165 Address more codacy complaints 2017-02-18 01:04:10 +00:00
Promofaux
b38808b76a Address codacy complaints 2017-02-18 01:00:32 +00:00
Promofaux
23e7708ee4 add back in 10 second functionality 2017-02-18 00:49:59 +00:00
Promofaux
2039fec556 clear localstorage item on manual enable 2017-02-18 00:45:05 +00:00
Promofaux
18d914322b add an id to the label that gets updated 2017-02-18 00:43:50 +00:00
Promofaux
d55a75366b Add a countdown timer next to the enable button. Works across page reloads 2017-02-18 00:38:31 +00:00
Promofaux
3037ef7710 timeout to be the same as whatever is set 2017-02-17 22:11:39 +00:00
Promofaux
4bfcb3e750 formatting 2017-02-17 22:10:39 +00:00