Commit Graph

209 Commits

Author SHA1 Message Date
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 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
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 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 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
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
Promofaux e54ad166cb Codacy loves a complain 2017-02-17 21:15:10 +00:00
Promofaux ff5cf63aaf Move modal dialog to footer.php so it works from anywhere 2017-02-17 21:01:54 +00:00
Promofaux 0e9976902b new button 2017-02-17 20:47:28 +00:00
Promofaux 5076de084b javascript 2017-02-17 20:46:43 +00:00
DL6ER 84c2eb921e Merge pull request #404 from pi-hole/fix/datetime
Fix timezone display in Query Log display
2017-02-16 14:19:04 +01:00
DL6ER 9d18684a58 Merge pull request #403 from PartTimeLegend/PartTimeLegend-patch-1
Part time legend patch 1
2017-02-16 14:17:47 +01:00
DL6ER 3c90f544b9 Fix timezone display in Query Log display 2017-02-16 11:43:09 +01:00
Antony Bailey b65544639d Set Github logo in footer to be link to Github Org 2017-02-15 21:15:15 +00:00
DL6ER cc13cf5e33 Internet explorer + Windows Edge compatibility 2017-02-10 12:26:20 +01:00
DL6ER 9765b38ec2 Added online debug log creator 2017-02-10 12:22:59 +01:00
Mcat12 ee41dbdc70 Merge pull request #391 from pi-hole/fix/xss-settings
Clean any inputs being added to $success or $error
2017-02-09 16:21:00 -05:00
DL6ER b8d6550096 Detect mime type of uploaded file on the server instead of relying on what the uploading OS tells us. Fixes #395 2017-02-09 16:21:21 +01:00
DL6ER 279ea1b18b Give some more details on teleporter failure 2017-02-09 15:25:25 +01:00
DL6ER 8c2fbde5ab Fix syntax error 2017-02-09 00:39:53 +01:00
Mcat12 ca8debea80 Merge pull request #394 from pi-hole/fix/PHPwarningCentOS
Check if time zone is set to mute some PHP warnings
2017-02-07 17:54:47 -05:00
DL6ER f5c4065b89 Check if time zone is set the mute some PHP warnings 2017-02-06 15:59:20 +01:00
DL6ER 13a73f5217 Move ampersand 2017-02-06 15:40:49 +01:00
Mcat12 8c821357ff Merge pull request #392 from pi-hole/revert-371-updateAdminLTE
Revert "Update AdminLTE v2.1.2 -> v2.3.8"
2017-02-05 14:38:28 -05:00
Mcat12 b586cb85ba Merge branch 'devel' into fix/IPv6field 2017-02-04 12:51:25 -05:00