Merge pull request EFForg#11938 from Hainish/release-2017.8.15

Release 2017.8.15
HTTPSNowhere · Aug 16, 2017 · 1bc5051 · 1bc5051
2 parents fd133ff + a1d3b24
commit 1bc5051
Show file tree

Hide file tree

Showing 11 changed files with 706 additions and 3,205 deletions.
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -8,43 +8,43 @@
     "author": "[email protected]",
     "background": {
         "scripts": [
-            "rules.js", 
-            "storage.js", 
-            "util.js", 
-            "background.js", 
+            "rules.js",
+            "storage.js",
+            "util.js",
+            "background.js",
             "incognito-cache-clearing.js"
         ]
-    }, 
-    "options_ui": {
-      "page": "options.html"
     },
     "browser_action": {
         "default_icon": {
             "38": "icons/icon-active-38.png"
-        }, 
-        "default_popup": "popup.html", 
+        },
+        "default_popup": "popup.html",
         "default_title": "__MSG_about_ext_name__"
-    }, 
-    "default_locale": "en", 
-    "description": "__MSG_about_ext_description__", 
-    "devtools_page": "devtools.html", 
-    "homepage_url": "https://www.eff.org/https-everywhere", 
+    },
+    "default_locale": "en",
+    "description": "__MSG_about_ext_description__",
+    "devtools_page": "devtools.html",
+    "homepage_url": "https://www.eff.org/https-everywhere",
     "icons": {
-        "128": "icons/icon-active-128.png", 
+        "128": "icons/icon-active-128.png",
         "48": "icons/icon-active-48.png"
-    }, 
-    "incognito": "spanning", 
-    "manifest_version": 2, 
+    },
+    "incognito": "spanning",
+    "manifest_version": 2,
     "minimum_chrome_version": "55",
-    "name": "__MSG_about_ext_name__", 
+    "name": "__MSG_about_ext_name__",
+    "options_ui": {
+        "page": "options.html"
+    },
     "permissions": [
-        "webNavigation", 
-        "webRequest", 
-        "webRequestBlocking", 
-        "tabs", 
-        "cookies", 
-        "storage", 
+        "webNavigation",
+        "webRequest",
+        "webRequestBlocking",
+        "tabs",
+        "cookies",
+        "storage",
         "*://*/*"
-    ], 
-    "version": "2017.7.18"
-}
+    ],
+    "version": "2017.8.15"
+}
diff --git a/chromium/popup.js b/chromium/popup.js
@@ -73,7 +73,7 @@ function appendRuleLineToListDiv(ruleset, list_div) {
     }
   }
 
-  if (navigator.userAgent.match("Chrome")) {
+  if (false) { //navigator.userAgent.match("Chrome")) {
     var xhr = new XMLHttpRequest();
     try {
       xhr.open("GET", favicon.src, true);

diff --git a/makecrx.sh b/makecrx.sh
@@ -4,8 +4,7 @@
 #
 # To build the current state of the tree:
 #
-#     ./makecrx.sh
-#
+#     ./makecrx.sh #
 # To build a particular tagged release:
 #
 #     ./makecrx.sh <version number>
@@ -72,6 +71,9 @@ cd ../..
 cp src/$RULESETS pkg/crx/rules/default.rulesets
 
 sed -i -e "s/VERSION/$VERSION/g" pkg/crx/manifest.json
+
+python2.7 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); e=m['author']; m['author']={'email': e}; del m['applications']; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+
 #sed -i -e "s/VERSION/$VERSION/g" pkg/crx/updates.xml
 #sed -e "s/VERSION/$VERSION/g" pkg/updates-master.xml > pkg/crx/updates.xml
 

diff --git a/src/Changelog b/src/Changelog
@@ -1,3 +1,9 @@
+2017.8.15
+  * Incorporating numerous fixes for WebExtensions to work within Firefox
+  * Firefox: Creating Embedded WebExtension wrapper to migrate legacy settings
+  * Removing legacy XPCOM codebase, unifying Firefox and Chrome codebase
+  * Ruleset updates
+
 Firefox 5.2.21 / Chrome 2017.7.18
   * Ruleset updates