Merge remote-tracking branch 'upstream/dev' into wiki

2016-05-27 06:35:15 -04:00
parent e00b8a7082 551cf8ee94
commit d554681174
152 changed files with 4445 additions and 5346 deletions
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -256,6 +256,7 @@ class Browser extends DAV\Browser\Plugin {
 				$func($a);
 			}
 		}
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
 		construct_page($a);
 	}