Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 04:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

80 Commits

Author SHA1 Message Date
Björn Bohman
1d36f664cf Send argument to getAllQueries() 
Send the value api.php is given for getAllQueries to getAllQueries().
This make getAllQueries() able to make decisions from the argument.
 2016-12-08 11:00:02 +01: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
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
DL6ER
22c32b269e Add ?jsonForceObject flag to enable JSON_FORCE_OBJECT 2016-11-24 16:48:11 +01:00
DL6ER
f0adb164d4 Merge branch 'devel' into auth 
Conflicts:
	api.php
	js/pihole/index.js
 2016-11-21 10:57:19 +01:00
DL6ER
f84d54558b Allow GET hash for API calls 2016-11-20 15:46:05 +01:00
DL6ER
e575988d37 Added some more comments in api.php 2016-11-19 12:56:50 +01:00
DL6ER
03ea07ec49 api.php?summaryRaw also accessible without auth token 2016-11-19 12:51:52 +01:00
DL6ER
8ecd218908 Many changes that are documented in PR #197 2016-11-18 21:31:30 +01:00
DL6ER
4372c2e25b Extend hash auth to API calls 2016-11-16 23:35:10 +01:00
DL6ER
3624b3ed85 Added new API call: overTimeData10mins 2016-11-09 15:02:05 +01:00
Rory M
26d54cfa9b Fix for XSS bug 
I actually tested this one! it works.
My apologies for the previous, non-working commits-- I had to refresh my knowledge of PHP.
 2016-04-22 14:27:21 +01:00
Rory M
b91b7cacb0 Final fix for XSS patch 
`htmlspecialchars` does not work on arrays.
This is why testing is important :^)
 2016-04-22 13:21:53 +01:00
Rory M
66e0c0f66e Fixed incorrect ordering of sanitisers 
`json_encode` needs to call the result of `htmlspecialchars`, not visa versa!
 2016-04-22 13:12:10 +01:00
Rory M
87ddd4cbc7 Fix for XSS bug 
Pointed at the correct branch this time.
 2016-04-22 12:34:41 +01:00
Adam Warner
74378b546e Update api.php 
Added missing ) on line 11
 2016-02-22 16:16:46 +00:00
Mcat12
6a2714d524 Api returns summary with no params 2016-02-22 08:24:00 -05:00
Brice Johnson
b80c373cfa Added page to view daily query log history 2016-02-13 00:01:50 -06:00
Brice Johnson
4fa6b3dc6b Added radar graph for top clients 2016-02-11 23:41:31 -06:00
Brice Johnson
0544cfb398 Added forwarding destination chart 2016-02-10 23:40:20 -06:00
Brice Johnson
5d68c72477 Added query types graph 2016-02-10 23:18:11 -06:00
Brice Johnson
51796f351c Enabled auto-update for summary statistics. Top row statistics update 
every 20 seconds.
 2016-02-04 23:37:08 -06:00
Brice Johnson
21741094f1 Moved data retrieval to Ajax call. Fixed ipv6 number. Fixed top 
domains/advertisers tables.
 2016-02-02 22:27:42 -06:00
Brice Johnson
98f0bb0d94 Fixed merge conflict in api.php. Moved js code to index.php from 
footer.html
 2016-01-30 19:06:15 -06:00
Brice Johnson
fa6f0a42a5 Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel 
Conflicts:
	api.php
	index.php
 2016-01-27 23:03:58 -06:00
Adam Warner
46a7bac6e4 Update api.php 
Consume JSON output of chronometer.sh

Relies on [this pull](https://github.com/jacobsalmela/pi-hole/pull/193) being merged.
 2016-01-18 23:04:03 +00:00
Brice Johnson
f018e0f6f9 Added lists of top domains/ads. Moved data collection to separate file. 2016-01-15 22:29:18 -06:00
Brice Johnson
293d2e7d21 Added top domains for queries and ads 2016-01-14 23:26:58 -06:00
Brice Johnson
8479530c67 Added basic read-only api 2016-01-09 20:04:24 -06:00