Skip to content
Snippets Groups Projects
Commit 93c80b92 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

More polish to activity-streams on Abrowser

parent 6cd6d074
No related branches found
No related tags found
No related merge requests found
diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm
--- firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-22 17:33:33.000000000 +0000 --- firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-22 17:33:33.000000000 +0000
+++ firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-24 16:00:23.580412017 +0000 +++ firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-24 23:19:12.842155717 +0000
@@ -26,14 +26,7 @@ @@ -26,14 +26,7 @@
const DEFAULT_SITES = new Map([ const DEFAULT_SITES = new Map([
...@@ -17,7 +17,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit ...@@ -17,7 +17,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
]); ]);
const GEO_PREF = "browser.search.region"; const GEO_PREF = "browser.search.region";
const REASON_ADDON_UNINSTALL = 6; const REASON_ADDON_UNINSTALL = 6;
@@ -60,12 +53,12 @@ @@ -60,19 +53,19 @@
provider_description: "pocket_description", provider_description: "pocket_description",
provider_icon: "pocket", provider_icon: "pocket",
provider_name: "Pocket", provider_name: "Pocket",
...@@ -36,7 +36,15 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit ...@@ -36,7 +36,15 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
show_spocs: false, show_spocs: false,
personalized: true personalized: true
}) })
@@ -100,11 +93,11 @@ }],
["showSponsored", {
title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)",
- value: true
+ value: false
}],
["filterAdult", {
title: "Remove adult pages from sites, highlights, etc.",
@@ -100,7 +93,7 @@
}], }],
["disableSnippets", { ["disableSnippets", {
title: "Disable snippets on activity stream", title: "Disable snippets on activity stream",
...@@ -45,12 +53,39 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit ...@@ -45,12 +53,39 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
}], }],
["showTopSites", { ["showTopSites", {
title: "Show the Top Sites section", title: "Show the Top Sites section",
- value: true @@ -116,12 +109,12 @@
+ value: false }],
["telemetry", {
title: "Enable system error and usage data collection",
- value: true,
+ value: false,
value_local_dev: false
}], }],
["collapseTopSites", { ["telemetry.ping.endpoint", {
title: "Collapse the Top Sites section", title: "Telemetry server endpoint",
@@ -197,7 +190,7 @@ - value: "https://tiles.services.mozilla.com/v4/links/activity-stream"
+ value: "https://127.0.0.1/"
}],
["section.highlights.collapsed", {
title: "Collapse the Highlights section",
@@ -137,7 +130,7 @@
}],
["tippyTop.service.endpoint", {
title: "Tippy Top service manifest url",
- value: "https://activity-stream-icons.services.mozilla.com/v1/icons.json.br"
+ value: "https://127.0.0.1"
}]
]);
@@ -190,14 +183,14 @@
"CA": ["en-US", "en-GB", "en-ZA"],
"DE": ["de", "de-DE", "de-AT", "de-CH"]
})[geo];
- return !!locales && locales.includes(locale);
+ return false;
}
},
{
name: "snippets", name: "snippets",
factory: () => new SnippetsFeed(), factory: () => new SnippetsFeed(),
title: "Gets snippets data", title: "Gets snippets data",
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=53 VERSION=54
. ./config . ./config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment