cc5be617c2
Merge branch 'master' into fix/QuerySorting
2017-03-03 23:39:24 +01:00
7c5e1ae28a
Merge pull request #424 from pi-hole/fix/DNSserverdisplaymaster
...
Loop over all available DNS server entries instead of only 12
2017-03-03 23:39:17 +01:00
e7a4068003
Bugfix: Sorting algorithm of DataTables is broken, use Momentum.js for filtering
2017-03-03 16:13:59 +01:00
6adbcea7b1
Loop over all available DNS server entries instead of only 12
2017-03-03 14:42:04 +01:00
00f4d3110c
Merge pull request #417 from pi-hole/devel
...
Pi-hole Web Admin v2.5
2017-03-02 14:35:23 -08:00
3647df731f
Merge pull request #421 from pi-hole/fix/disablepermanently
...
Start count down only if there is something to count down
2017-03-02 11:29:11 +00:00
7729eea48d
Start count down only if there is something to count down
2017-03-01 14:12:13 +01:00
e310acdb4b
Merge pull request #420 from pi-hole/new/dnsmasqListeningBehavior
...
Setup interface listening behavior of dnsmasq
2017-03-01 12:33:48 +01:00
6cef1b3085
Setup interface listening behavior of dnsmasq
2017-03-01 11:25:28 +01:00
cd0402996a
Merge pull request #419 from pi-hole/fix/loaddisplay
...
Round load display to precision two
2017-03-01 00:01:56 +01:00
a2f2fbfccf
Show info text
2017-02-28 23:59:24 +01:00
220b31a714
Try to derive number of cores from /proc/cpuinfo if nproc is not available
2017-02-28 23:51:58 +01:00
107ae02887
Round load display to precision two
2017-02-28 23:41:03 +01:00
3b5578321a
Merge pull request #413 from pi-hole/tweak/enable_disable_API
...
Improve Enable/Disable through API
2017-02-27 21:42:16 -05:00
e6d0dd4839
Add version/type parameters to API (will be used in the future to decide what backend is powering the frontend) ( #414 )
2017-02-27 23:12:39 +01:00
03550f36aa
Merge branch 'devel' into tweak/enable_disable_API
2017-02-27 22:52:22 +01:00
d104539708
API QR token generator ( #410 )
...
* Added API QR token generator
* Pass only token
* Corrected link
2017-02-27 22:33:35 +01:00
276f2c1628
Allow usage of Teleporter and QueryAds backend only if a valid session is detected ( #415 )
2017-02-27 22:32:03 +01:00
f328595d6d
Remove [ ] from SERVER_NAME variable ( #405 )
2017-02-27 22:17:46 +01:00
110ab455b6
Merge pull request #399 from pi-hole/new/OnlineDebug
...
Added online debug log creator
2017-02-27 12:30:48 -08:00
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
0abee8efb6
Merge pull request #412 from pi-hole/tweak/customDisableTimeGlovalCountdown
...
Show disable timer across all devices
2017-02-24 10:42:18 +00:00
4bf4fc50be
Merge pull request #416 from pi-hole/tweak/main-page-name
...
change verbiage Main Page to Dashboard
2017-02-23 11:45:45 -06:00
191472c4c3
Two further changes on the Help page
2017-02-23 18:43:52 +01:00
5569ce69b6
Also rename on Help page
2017-02-23 18:41:57 +01:00
c4cdcd9e94
change verbiage Main Page to Dashboard
2017-02-23 11:35:58 -06:00
8d59283d09
Small typo
2017-02-23 14:27:37 +01:00
616213d10b
Improve Enable/Disable through API as often requested
2017-02-23 14:24:14 +01:00
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
20ce214c9f
Add checkbox if the user wants his debug log to be uploaded automatically
2017-02-22 19:47:58 +01:00
71672319af
Another codacy commit
2017-02-22 18:07:12 +01:00
c99f23c995
Codacy
2017-02-22 17:35:31 +01:00
e422e820d1
Show disable timer across all devices
2017-02-22 15:44:07 +01:00
4cc917dd91
Codacy
2017-02-22 15:07:02 +01:00
726c188c66
Merge pull request #411 from pi-hole/fixDomainQuery
...
whitespace in licence header causing issues with query adlists page
2017-02-20 23:00:36 +00:00
d1ed5652a8
Another small change to ensure the remining line endings are also gone
2017-02-20 23:11:38 +01:00
81ed75eb84
same thing on gravity.sh.php
2017-02-20 21:43:37 +00:00
94539d3952
whitespace in licence header causing issues with query adlists page
2017-02-20 21:41:55 +00:00
02827cac54
Merge pull request #409 from pi-hole/fix/Licenseheaders
...
Fix whitespace caused by added license headers
2017-02-19 20:21:58 +00:00
d7fdaf9273
Fix whitespace caused by added license headers
2017-02-19 21:19:02 +01:00
80ad3bac4d
Merge pull request #406 from pi-hole/customDisable
...
Custom disable time
2017-02-19 02:02:31 +00:00
1aad0c49e7
Merge pull request #407 from pi-hole/dnsWatch
...
Add DNS.Watch servers to web admin
2017-02-18 19:17:19 +00:00
86880668fa
Add DNS.WATCH servers from https://github.com/pi-hole/pi-hole/pull/1253
2017-02-18 17:51:15 +00:00
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
a6439d8165
Address more codacy complaints
2017-02-18 01:04:10 +00:00
b38808b76a
Address codacy complaints
2017-02-18 01:00:32 +00:00
23e7708ee4
add back in 10 second functionality
2017-02-18 00:49:59 +00:00
2039fec556
clear localstorage item on manual enable
2017-02-18 00:45:05 +00:00
18d914322b
add an id to the label that gets updated
2017-02-18 00:43:50 +00:00
d55a75366b
Add a countdown timer next to the enable button. Works across page reloads
2017-02-18 00:38:31 +00:00
DL6ER
DL6ER
Dan Schaper
Adam Warner
Mcat12
Dan Schaper
Jacob Salmela
Jacob Salmela
Adam Warner