e93f33bcf0
Show more detailed output if not on master
2016-12-09 23:18:47 +01:00
4aab4e69cc
Merge pull request #231 from pi-hole/FIXversionCompare
...
Don't recommend to update when on vDev
2016-12-08 17:34:25 -05:00
002040452b
Codacy fixes
2016-12-08 17:33:21 -05:00
e9a7c2f5f7
Assume version is vDev if not on master branch
...
This removes the need for a vDev tag, which was less reliable
because it needed to be the most recent tag in the dev branch and
was really just an sign that the repo was on a branch besides
master.
2016-12-08 17:20:39 -05:00
eeb8811738
Remove some obsolete checks if on development version
2016-12-08 23:01:25 +01:00
b204eaca30
If we are on vDev then we assume that it is always newer than the latest online release, i.e. version comparion should return 1
2016-12-08 22:57:23 +01:00
9209f5c8ce
Merge pull request #227 from pi-hole/FIXversionCompare
...
fix versionCompare
2016-12-08 16:51:41 -05:00
9812e46e00
Added a brace that disappeared earlier.
2016-12-08 22:44:13 +01:00
cadec75436
Merge pull request #229 from pi-hole/improvehelp
...
Improve Help Center
2016-12-08 16:46:09 +01:00
6c9af746b9
Add that we update the main graph every 10 minutes
2016-12-08 12:55:37 +01:00
6459e17478
Improve Help Center
2016-12-08 12:53:25 +01:00
bb3d343c39
Fix versionCompare(left, right)
2016-12-08 10:52:20 +01:00
2f03c5491c
Merge pull request #223 from pi-hole/FastercountDnsQueries
...
Improve speed of getSummaryData()
2016-12-06 14:22:00 +01:00
9179a20fa2
Don't show " read "
2016-12-06 08:39:24 +01:00
bc8ac73cfa
Made gravityCount() faster
2016-12-05 13:40:56 +01:00
6b1d6d19ac
Add function countBlockedQueries()
2016-12-05 13:30:24 +01:00
0a9a55fe3a
Improve speed of getSummaryData()
2016-12-05 13:07:36 +01:00
1c135448ec
Merge pull request #188 from pi-hole/secure-pause-resume
...
Secure pause resume plus general security fixes
2016-12-04 14:19:14 -05:00
3c35afe217
Make sure token is URL safe
2016-12-04 13:58:24 -05:00
cc6e029f78
Make sure the api doesn't enable and disable at the same time.
2016-12-04 13:32:17 -05:00
0dec4b8aa0
Protect Enable/Disable with a CSRF token check
...
The token is now added for all pages.
2016-12-04 13:16:45 -05:00
a4c01a554c
Show loading indicator
...
Also prevent the browser from actually going to `#` when clicked.
2016-12-03 18:29:25 -05:00
c3b78e8ef6
Change strings to doublequote
2016-12-03 14:18:08 -05:00
ee0913a7a2
Move enable/disable to API
...
Also check CORS for all API calls. With the same import, we can
enable CSRF token checking on the API.
2016-12-03 13:40:04 -05:00
40c6ee9f5a
Remove strict flag and change Host check
...
Since the Host header is easily manipulated, we can only check if
it's wrong and can't use it to validate that the client is authorized,
only unauthorized. There's no need for the strict flag anymore
because of this.
2016-12-02 16:06:43 -05:00
6b8fa7dbe4
Merge remote-tracking branch 'origin/devel' into secure-pause-resume
...
Conflicts:
header.php
2016-12-01 20:47:04 -05:00
1fb67c76fa
Merge pull request #216 from pi-hole/keepmainpageupdated
...
Keep main graph updated
2016-12-01 20:15:37 -05:00
d9a5fc5c44
Merge pull request #215 from pi-hole/dl6er-patch-1
...
Add additional pagination control above table in "Query Log"
2016-12-01 18:33:42 -05:00
e955418c93
Merge pull request #213 from DL6ER/helpandotherthings
...
Extend Help Center and fix some warnings
2016-12-01 18:20:54 -05:00
01008ed7bb
Don't retry if it has failed more than five times in a row
2016-11-26 23:15:20 +01:00
6f8e423c7b
Keep main diagram updated (every 10min on success, try again after 1min if update fails)
2016-11-26 14:54:25 +01:00
540d188476
Updated DataTables from v.1.10.11 to v.1.10.12 + inmproved styling by using bootstrap commands
2016-11-26 12:23:16 +01:00
d16393a705
Additional pagination control above table in "Query Log"
2016-11-26 12:08:48 +01:00
4ffbf17d39
Merge branch 'helpandotherthings' of https://github.com/DL6ER/AdminLTE into helpandotherthings
2016-11-25 11:15:43 +01:00
0b329021dc
Merge branch 'devel' into helpandotherthings
2016-11-25 11:15:27 +01:00
147e97483b
Implemented the changes
2016-11-24 21:59:04 +01:00
f251b5e648
Merge pull request #214 from DL6ER/jsonforceobject
...
Add jsonForceObject flag to enable JSON_FORCE_OBJECT
2016-11-24 11:34:18 -05:00
22c32b269e
Add ?jsonForceObject flag to enable JSON_FORCE_OBJECT
2016-11-24 16:48:11 +01:00
5f34f6cac3
Fixed typo
2016-11-24 13:04:02 +01:00
9dfe10fd01
Changed a comment
2016-11-24 12:58:28 +01:00
1747fe16f2
session_start() already called earlier by password.php, leading to "PHP Notice: A session had already been started - ignoring session_start() in /var/www/html/admin/queries.php on line 4" fixed
2016-11-24 12:56:13 +01:00
fbe715c338
Small fix in password.php: Verify that there is a password hash before trying to access it
2016-11-24 12:54:26 +01:00
35f250352f
Small fix for header.php (prevent accumulation of "PHP Notice: Undefined index: TEMPERATUREUNIT" in lighttpd's error.log)
2016-11-24 12:47:56 +01:00
8f1b3a4101
Extended Help Center
2016-11-24 12:46:44 +01:00
8f2a028f5b
Merge pull request #211 from DL6ER/fixgraph
...
Fixes the main diagram
2016-11-23 20:37:15 +01:00
d8644c2999
Removed an unused variable;
2016-11-23 18:53:04 +01:00
69336891fc
Remove debug statement
2016-11-23 18:43:54 +01:00
51cce7b37b
Merge branch 'devel' into fixgraph
2016-11-23 18:40:16 +01:00
4e9f6b6ff0
Merge pull request #197 from DL6ER/auth
...
Add server-side password protection for the web interface
2016-11-23 12:38:24 -05:00
e1dae514ad
Fixes the main diagram
2016-11-23 18:33:11 +01:00
DL6ER
Mcat12
DL6ER