Commit Graph

146 Commits

Author SHA1 Message Date
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
DL6ER 9812e46e00 Added a brace that disappeared earlier. 2016-12-08 22:44:13 +01:00
DL6ER bb3d343c39 Fix versionCompare(left, right) 2016-12-08 10:52:20 +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 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 1fb67c76fa Merge pull request #216 from pi-hole/keepmainpageupdated
Keep main graph updated
2016-12-01 20:15:37 -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 d8644c2999 Removed an unused variable; 2016-11-23 18:53:04 +01:00
DL6ER 69336891fc Remove debug statement 2016-11-23 18:43:54 +01:00
DL6ER 51cce7b37b Merge branch 'devel' into fixgraph 2016-11-23 18:40:16 +01:00
DL6ER e1dae514ad Fixes the main diagram 2016-11-23 18:33:11 +01:00
DL6ER d9adcccbc3 Merge branch 'devel' into auth
Conflicts:
	header.php
2016-11-23 18:02:40 +01:00
Mcat12 2d1b60fef4 Merge pull request #207 from DL6ER/queryfilters
Be able to pass filters to queries.php
2016-11-23 11:49:59 -05:00
Mcat12 f8442e954e Merge pull request #209 from DL6ER/queryads
Query list of ad-serving domains via Web UI
2016-11-23 11:35:15 -05:00
DL6ER 623ae2c56e Moved definition of var domain outside of the for-in loop 2016-11-23 12:02:48 +01:00
DL6ER cfc76cc934 codacy: Strings must use doublequote. 2016-11-23 12:02:18 +01:00
DL6ER 3b5c2f6ddc codacy: Strings must use doublequote. 2016-11-23 12:00:59 +01:00
DL6ER 5dfab7cdc2 Incorporate @Mcat12's comments 2016-11-23 11:59:18 +01:00
DL6ER c3bc146db1 Added function to properly escape the regexp search string in queries.js 2016-11-23 11:53:01 +01:00
DL6ER 1f9793354d Be sure to sanitize domain names in links 2016-11-23 11:47:04 +01:00
DL6ER 07376ffad9 Fixed copy-and-paste error 2016-11-23 11:39:06 +01:00
DL6ER 83cf008fca Fixed comment 2016-11-22 15:43:12 +01:00
DL6ER 64d532a95c Pass "Invalid domain!" error message to user 2016-11-22 15:36:16 +01:00
DL6ER 7f7604a6af Add "Query adlists" feature 2016-11-22 15:23:30 +01:00
DL6ER 9f30aca516 Strings must use doublequote 2016-11-22 14:13:17 +01:00
DL6ER 96f7bf5921 Add flushing of the pi-hole log file using the web UI 2016-11-22 14:09:46 +01:00
DL6ER e94a2be016 More codacy complaints 2016-11-21 18:58:04 +01:00
DL6ER d4aa4fce97 Another semicolon 2016-11-21 18:34:19 +01:00
DL6ER 916614542a Lost $ sign 2016-11-21 18:33:27 +01:00
DL6ER e67a16a54c Another minor change 2016-11-21 18:29:21 +01:00
DL6ER 214b96fea2 Fixed some small errors 2016-11-21 17:58:20 +01:00
DL6ER 57c262a704 Be able to call queries.js with preset filters from the main page 2016-11-21 17:32:51 +01:00
DL6ER 4675b5ae92 Load "Top Domains", "Top Advertisers", and "Top Clients" only if authorized 2016-11-21 11:01:55 +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 9e3a092701 Addressed codacy issues 2016-11-21 10:51:45 +01:00
DL6ER 1cf031ab68 Show "-- : --" if session timer has expired. Show session timer only if user is logged in. 2016-11-20 21:14:34 +01:00
DL6ER 829c8544db Completely hide session timer if there is no session (i.e. no password set) 2016-11-20 21:09:00 +01:00
DL6ER 0cd099f6f1 Added session timer 2016-11-20 21:05:08 +01:00
DL6ER 28dd6ed75a Minor change 2016-11-20 15:38:32 +01:00
DL6ER bfdefddec6 Removed hash from Query log request 2016-11-20 15:35:03 +01:00
DL6ER cd75d7e7a3 Remove hash from the javascript scripts. 2016-11-20 15:34:03 +01:00
DL6ER 15baa4be00 Changed definition of callback to method shorthand. Added missing semicolon. 2016-11-20 15:02:22 +01:00
DL6ER 06f8f0da27 Actually pass the password hash to the script that runs the update 2016-11-20 14:57:24 +01:00