Merge branch 'master' into Basilisk-release

4 files changed, 24 insertions, 9 deletions

diff --git a/application/palemoon/app/blocklist.xml b/application/palemoon/app/blocklist.xml
index d55784169..fa594aabe 100644
--- a/application/palemoon/app/blocklist.xml
+++ b/application/palemoon/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<blocklist lastupdate="1534840140000"
+<blocklist lastupdate="1554898538000"
 xmlns="http://www.mozilla.org/2006/addons-blocklist">
   <emItems>
     <emItem blockID="i545" id="superlrcs@svenyor.net">
@@ -2524,6 +2524,11 @@ xmlns="http://www.mozilla.org/2006/addons-blocklist">
       </versionRange>
       <prefs></prefs>
     </emItem>
+    <emItem blockID="pm114" id="jid1-KKzOGWgsW3Ao4Q@jetpack">
+      <versionRange minVersion="2.9.9" maxVersion="2.9.9" severity="3">
+      </versionRange>
+      <prefs></prefs>
+    </emItem>
   </emItems>
   <pluginItems>
     <pluginItem blockID="p26">
diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build
index c11f4c37e..8166760af 100644
--- a/application/palemoon/app/moz.build
+++ b/application/palemoon/app/moz.build
@@ -20,6 +20,7 @@ if CONFIG['LIBXUL_SDK']:
 SOURCES += ['nsBrowserApp.cpp']
 
 FINAL_TARGET_FILES += ['blocklist.xml']
+FINAL_TARGET_FILES.defaults += ['permissions']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
diff --git a/application/palemoon/app/permissions b/application/palemoon/app/permissions
new file mode 100644
index 000000000..4d90be82a
--- /dev/null
+++ b/application/palemoon/app/permissions
@@ -0,0 +1,14 @@
+# This file has default permissions for the permission manager.

+# The file-format is strict:

+# * matchtype \t type \t permission \t host

+# * "origin" should be used for matchtype, "host" is supported for legacy reasons

+# * type is a string that identifies the type of permission (e.g. "cookie")

+# * permission is an integer between 1 and 15

+# See nsPermissionManager.cpp for more...

+

+# XPInstall

+origin	install	1	http://www.palemoon.org

+origin	install	1	https://www.palemoon.org

+

+origin	install	1	http://addons.palemoon.org

+origin	install	1	https://addons.palemoon.org

diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 85dc41c15..d0e078eb7 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -206,9 +206,6 @@ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending af
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
 
-pref("xpinstall.whitelist.add", "addons.mozilla.org,www.palemoon.org,addons.palemoon.org");
-pref("xpinstall.whitelist.add.36", "");
-pref("xpinstall.whitelist.add.180", "");
 pref("xpinstall.whitelist.required", false);
 // Allow installing XPI add-ons by direct URL requests (no referrer)
 pref("xpinstall.whitelist.directRequest", true);
@@ -1080,17 +1077,12 @@ pref("browser.newtab.preload", false);
 // Toggles the content of 'about:newtab'. Shows the grid when enabled.
 pref("browser.newtabpage.enabled", true);
 
-// XXX: Remove this when "enhanced" tiles are dead
-pref("browser.newtabpage.enhanced", false);
-
 // Disables capturing of page thumbnails
 pref("browser.pagethumbnails.capturing_disabled", false);
 
 // enables showing basic placeholders for missing thumbnails
 pref("browser.newtabpage.thumbnailPlaceholder", false);
 
-pref("privacy.usercontext.about_newtab_segregation.enabled", false);
-
 // number of columns of newtab grid
 pref("browser.newtabpage.columns", 4);
 
@@ -1105,6 +1097,9 @@ pref("full-screen-api.enabled", true);
 // 0-100 (currently)
 pref("permissions.places-sites-limit", 50);
 
+// Built-in default permissions.
+pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions");
+
 // Startup Crash Tracking
 // number of startup crashes that can occur before starting into safe mode automatically
 // (this pref has no effect if more than 6 hours have passed since the last crash)