summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--browser/app/profile/firefox.js14
-rw-r--r--browser/branding/official/pref/firefox-branding.js3
2 files changed, 2 insertions, 15 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 5637d1797..fb85a9fb9 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -122,11 +122,7 @@ pref("app.update.auto", true);
pref("app.update.silent", false);
// If set to true, the hamburger button will show badges for update events.
-#ifndef RELEASE_OR_BETA
pref("app.update.badge", true);
-#else
-pref("app.update.badge", false);
-#endif
// app.update.badgeWaitTime is in branding section
// If set to true, the Update Service will apply updates in the background
@@ -179,7 +175,7 @@ pref("browser.eme.ui.enabled", false);
#endif
// UI tour experience.
-pref("browser.uitour.enabled", true);
+pref("browser.uitour.enabled", false);
pref("browser.uitour.loglevel", "Error");
pref("browser.uitour.requireSecure", true);
pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
@@ -209,11 +205,7 @@ pref("general.autoScroll", true);
pref("browser.shell.checkDefaultBrowser", true);
pref("browser.shell.shortcutFavicons",true);
pref("browser.shell.mostRecentDateSetAsDefault", "");
-#ifdef RELEASE_OR_BETA
pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", false);
-#else
-pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", true);
-#endif
pref("browser.shell.skipDefaultBrowserCheck", true);
pref("browser.shell.defaultBrowserCheckCount", 0);
pref("browser.defaultbrowser.notificationbar", false);
@@ -306,11 +298,7 @@ pref("browser.urlbar.suggest.history.onlyTyped", false);
pref("browser.urlbar.formatting.enabled", true);
pref("browser.urlbar.trimURLs", true);
-#if defined(NIGHTLY_BUILD)
-pref("browser.urlbar.oneOffSearches", true);
-#else
pref("browser.urlbar.oneOffSearches", false);
-#endif
pref("browser.altClickSave", false);
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index 190b84e78..3a97a1490 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -41,8 +41,7 @@ pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPAT
pref("general.useragent.compatMode.firefox",true);
pref("general.useragent.compatMode.gecko",true);
-// Switch Application Updates off for now
-pref("app.update.enabled", false);
+pref("app.update.enabled", true);
// Shared User Agent Overrides
#include ../../shared/uaoverrides.inc