pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,155 Commits 16 Branches 105 Tags
735518a42d80b8b466bcfe8533af7bff0d656d10
Commit Graph
1155 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER 735518a42d Merge pull request #236 from pi-hole/Mcat12-remove-CORS-skip-msg 
Remove CORS skip log message
 2016-12-10 17:51:37 +01:00
Mcat12 8cf7e262a2 Remove CORS skip log message 
It can fill up the error log really quickly, since this function is now used on all pages. Most of these pages are not able to be protected by CORS but can still be protected by the Host check.
 2016-12-10 11:47:47 -05:00
DL6ER d2f4753cfc Merge pull request #235 from pi-hole/percentageTooltipClients 
add percentage tool tip to Top Clients progress bars
 2016-12-10 10:01:33 +01:00
DL6ER bba2e38518 Add definition for variable 'percentage' 2016-12-10 09:57:10 +01:00
Adam Warner 8d539b296c Merge pull request #234 from pi-hole/showbranch 
Show more detailed output of version if not on branch master
 2016-12-09 23:15:41 +00:00
Promofaux 8c158eb7ba add percentage tool tip to Top Clients progress bars, as with Top Domains and Top Advertisers 2016-12-09 23:13:11 +00:00
Adam Warner 89e644f40b Merge pull request #233 from pi-hole/displaypercentage 
Show percentage when placing mouse on progress bars
 2016-12-09 22:55:49 +00:00
DL6ER 8bfab70e62 Use 7 instead of 10 digits hash for the sake of convenience 2016-12-09 23:41:17 +01:00
DL6ER e93f33bcf0 Show more detailed output if not on master 2016-12-09 23:18:47 +01:00
DL6ER 6247960580 Strings must use doublequote. 2016-12-09 18:05:04 +01:00
DL6ER ae2bc08f0b Show percentage when placing mouse on progress bars 2016-12-09 17:56:13 +01:00
Mcat12 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
Mcat12 002040452b Codacy fixes 2016-12-08 17:33:21 -05:00
Mcat12 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
DL6ER eeb8811738 Remove some obsolete checks if on development version 2016-12-08 23:01:25 +01:00
DL6ER 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
Mcat12 9209f5c8ce Merge pull request #227 from pi-hole/FIXversionCompare 
fix versionCompare
 2016-12-08 16:51:41 -05:00
DL6ER 9812e46e00 Added a brace that disappeared earlier. 2016-12-08 22:44:13 +01:00
DL6ER cadec75436 Merge pull request #229 from pi-hole/improvehelp 
Improve Help Center
 2016-12-08 16:46:09 +01:00
DL6ER 6c9af746b9 Add that we update the main graph every 10 minutes 2016-12-08 12:55:37 +01:00
DL6ER 6459e17478 Improve Help Center 2016-12-08 12:53:25 +01:00
DL6ER bb3d343c39 Fix versionCompare(left, right) 2016-12-08 10:52:20 +01:00
Dominik 2f03c5491c Merge pull request #223 from pi-hole/FastercountDnsQueries 
Improve speed of getSummaryData()
 2016-12-06 14:22:00 +01:00
DL6ER 9179a20fa2 Don't show " read " 2016-12-06 08:39:24 +01:00
DL6ER bc8ac73cfa Made gravityCount() faster 2016-12-05 13:40:56 +01:00
DL6ER 6b1d6d19ac Add function countBlockedQueries() 2016-12-05 13:30:24 +01:00
DL6ER 0a9a55fe3a Improve speed of getSummaryData() 2016-12-05 13:07:36 +01:00
Mcat12 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
Mcat12 3c35afe217 Make sure token is URL safe 2016-12-04 13:58:24 -05:00
Mcat12 cc6e029f78 Make sure the api doesn't enable and disable at the same time. 2016-12-04 13:32:17 -05:00
Mcat12 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
Mcat12 a4c01a554c Show loading indicator 
Also prevent the browser from actually going to `#` when clicked.
 2016-12-03 18:29:25 -05:00
Mcat12 c3b78e8ef6 Change strings to doublequote 2016-12-03 14:18:08 -05:00
Mcat12 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
Mcat12 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
Mcat12 6b8fa7dbe4 Merge remote-tracking branch 'origin/devel' into secure-pause-resume 
Conflicts:
	header.php
 2016-12-01 20:47:04 -05:00
Mcat12 1fb67c76fa Merge pull request #216 from pi-hole/keepmainpageupdated 
Keep main graph updated
 2016-12-01 20:15:37 -05:00
Mcat12 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
Mcat12 e955418c93 Merge pull request #213 from DL6ER/helpandotherthings 
Extend Help Center and fix some warnings
 2016-12-01 18:20:54 -05:00
DL6ER 01008ed7bb Don't retry if it has failed more than five times in a row 2016-11-26 23:15:20 +01:00
DL6ER 6f8e423c7b Keep main diagram updated (every 10min on success, try again after 1min if update fails) 2016-11-26 14:54:25 +01:00
DL6ER 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
DL6ER d16393a705 Additional pagination control above table in "Query Log" 2016-11-26 12:08:48 +01:00
DL6ER 4ffbf17d39 Merge branch 'helpandotherthings' of https://github.com/DL6ER/AdminLTE into helpandotherthings 2016-11-25 11:15:43 +01:00
DL6ER 0b329021dc Merge branch 'devel' into helpandotherthings 2016-11-25 11:15:27 +01:00
DL6ER 147e97483b Implemented the changes 2016-11-24 21:59:04 +01:00
Mcat12 f251b5e648 Merge pull request #214 from DL6ER/jsonforceobject 
Add jsonForceObject flag to enable JSON_FORCE_OBJECT
 2016-11-24 11:34:18 -05:00
DL6ER 22c32b269e Add ?jsonForceObject flag to enable JSON_FORCE_OBJECT 2016-11-24 16:48:11 +01:00
DL6ER 5f34f6cac3 Fixed typo 2016-11-24 13:04:02 +01:00
DL6ER 9dfe10fd01 Changed a comment 2016-11-24 12:58:28 +01:00