5.0.1 / chrome-2015.3.31

jsha · jsha · commit 1836a6bbdde8 · 2015-03-31T12:40:02.000-07:00
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -12,6 +12,13 @@
             "background.js"
         ]
     }, 
+    "browser_action": {
+        "default_icon": {
+            "38": "icon38.png"
+        }, 
+        "default_popup": "popup.html", 
+        "default_title": "__MSG_about_ext_name__"
+    }, 
     "default_locale": "en", 
     "description": "__MSG_about_ext_description__", 
     "devtools_page": "devtools.html", 
@@ -25,21 +32,14 @@
     "manifest_version": 2, 
     "minimum_chrome_version": "18", 
     "name": "__MSG_about_ext_name__", 
-    "browser_action": {
-        "default_icon": {
-            "38": "icon38.png"
-        },
-        "default_popup": "popup.html", 
-        "default_title": "__MSG_about_ext_name__"
-    }, 
     "permissions": [
         "webRequest", 
         "webRequestBlocking", 
         "tabs", 
         "cookies", 
-        "storage",
+        "storage", 
         "<all_urls>"
     ], 
     "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
-    "version": "2015.3.23"
-}
+    "version": "2015.3.31"
+}
diff --git a/https-everywhere-tests/README.md b/https-everywhere-tests/README.md
@@ -38,7 +38,6 @@ implement them as automated tests:
 - Visit an HTTPS site that contains passive mixed content that is not rewritten
   to HTTPS. https://jacob.hoffman-andrews.com/passive-mixed-content.html is a
   good example. Verify the passive mixed content (e.g., image) does not load.
-  NOTE: Currently fails. https://github.com/EFForg/https-everywhere/issues/857
 - Click icon menu, click 'About HTTPS Everywhere.' Verify dialog opens.
 - Click icon menu, click 'SSL Observatory Preferences.' Verify dialog opens.
 - Click icon menu, click 'Disable HTTPS Everywhere.' Verify icon turns grey.
diff --git a/src/Changelog b/src/Changelog
@@ -1,4 +1,10 @@
-Firefox 5.0 / Chrome-2015.03.23             (2015-03-23)
+Firefox 5.0.1 / Chrome-2015.3.31            (2015-03-31)
+  * Disabled some broken rulesets.
+  * Fixed and updated many rulesets.
+  * Better null checking in Firefox.
+  * Add "Block All HTTP Requests" in Chrome.
+
+Firefox 5.0 / Chrome-2015.3.23              (2015-03-23)
   * First stable 5.0 release
   Versus 4.0.3:
   * Many new rulesets.
diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
@@ -21,7 +21,7 @@
 
     <groupbox>
       <caption label="&https-everywhere.about.version;" />
-      <label>5.0</label>
+      <label>5.0.1</label>
     </groupbox>
     
     <groupbox>
diff --git a/src/chrome/content/code/X509ChainWhitelist.js b/src/chrome/content/code/X509ChainWhitelist.js
diff --git a/src/install.rdf b/src/install.rdf
