commit c0a8ed3cc6331a20c7d8f4df9eda963eae1f8b12
author Dan Silivestru <dan.silivestru@tinyhippos.com> Mon Apr 30 23:39:54 2012 -0400
committer Dan Silivestru <dan.silivestru@tinyhippos.com> Mon Apr 30 23:39:54 2012 -0400
tree aad6a4aa4822ed46c8a63fe0a78bb02097848ae7
parent 2dd06d33d6f0c514469198be34a665f39ee0e8e8
parent 338203c0ce7785cb0ff1a49a18aa00e920cedd7d

Merge branch 'next'

doc/CHANGELOG.md

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index d97846f..309c8be 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Added userAgent emulation
 * Added initial support for Cordova/PhoneGap 1.6 (alpha)
 * (fix) Improved injection routine
+* (known issue) Disabled loading in file:/// scheme
 
 ## v0.9.3 - March 10, 2012
 

ext/chromium/manifest.json

diff --git a/ext/chromium/manifest.json b/ext/chromium/manifest.json
index b2cd941..1b7ecf0 100644
--- a/ext/chromium/manifest.json
+++ b/ext/chromium/manifest.json
@@ -23,7 +23,7 @@
         "matches": ["http://*/*","https://*/*","file:///*"],
         "all_frames": true
     }],
-    "permissions": ["tabs", "unlimitedStorage", "notifications", "contextMenus", "webRequest", "webRequestBlocking", "http://*/*", "https://*/*", "file:///*/*"],
+    "permissions": ["tabs", "unlimitedStorage", "notifications", "contextMenus", "webRequest", "webRequestBlocking", "http://*/*", "https://*/*"],
     "description": "A browser based html5 mobile application development and testing tool",
     "file_name": "manifest.json",
     "update_page": "update.html"