From ef9aeb6a08749ecc43242ba523d67632a6ddc0dc Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 10 Aug 2017 23:16:51 +0200 Subject: Update UA construction. --- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/config/version.txt b/browser/config/version.txt index b406fbef6..d90a8c220 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -55.0.0 +52.9.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index b406fbef6..d90a8c220 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -55.0.0 +52.9.0 -- cgit v1.2.3 From 580ebc105678c6d01cf64e7d75116d77984024a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 00:28:41 +0200 Subject: Replace display version in about box with build ID. --- browser/base/content/aboutDialog.js | 15 ++++++++------- browser/base/content/aboutDialog.xul | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index b024d2d52..55d8ff262 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -40,16 +40,17 @@ function init(aEvent) // Pref is unset } - // Include the build ID and display warning if this is an "a#" (nightly or aurora) build + // Include the build ID let versionField = document.getElementById("version"); let version = Services.appinfo.version; + let buildID = Services.appinfo.appBuildID; + let year = buildID.slice(0, 4); + let month = buildID.slice(4, 6); + let day = buildID.slice(6, 8); + versionField.textContent = buildID + ` (${year}-${month}-${day})`; + + // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - versionField.textContent += ` (${year}-${month}-${day})`; - document.getElementById("experimental").hidden = false; document.getElementById("communityDesc").hidden = true; } diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index ef2804f31..7988c0e34 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -45,7 +45,7 @@ -#expand +#expand #ifndef NIGHTLY_BUILD #endif -- cgit v1.2.3 From 5f813f143bad0919f4c228f5045c3b090eeb25fd Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 21 Feb 2018 22:31:23 +0100 Subject: Provide UA Gecko and Firefox slices by default for web compatibility. --- browser/branding/official/pref/firefox-branding.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser') diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index eb2bf489b..190b84e78 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -37,6 +37,10 @@ pref("app.update.url.manual", "https://@BRANDING_SITEURL@/"); // supplied in the "An update is available" page of the update wizard. pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); +// Provide UA Gecko and Firefox slices for web compatibility +pref("general.useragent.compatMode.firefox",true); +pref("general.useragent.compatMode.gecko",true); + // Switch Application Updates off for now pref("app.update.enabled", false); -- cgit v1.2.3 From 49e8a36e170da3066d7c0216fca272ecac988102 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 20:02:04 +0200 Subject: Link about dialog version to general.useragent.appVersionIsBuildID. true: YYYY.MM.DD.HHMM false: v{internal version number} (YYYY-MM-DD) --- browser/base/content/aboutDialog.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 55d8ff262..04384d584 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -47,7 +47,13 @@ function init(aEvent) let year = buildID.slice(0, 4); let month = buildID.slice(4, 6); let day = buildID.slice(6, 8); - versionField.textContent = buildID + ` (${year}-${month}-${day})`; + let hour = buildID.slice(8, 10); + let minute = buildID.slice(10, 12); + if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { + versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + } else { + versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; + } // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { -- cgit v1.2.3 From 8896ca5c0a7b8bc6a086bf60d67b14fca5488dc8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 Aug 2017 00:48:59 +0200 Subject: Update various texts and references. --- browser/base/content/aboutDialog.xul | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 7988c0e34..b77896b95 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD - +#expand #endif @@ -120,19 +120,13 @@ - &community.start2;&community.middle2;&community.end3; + Basilisk is community software released by and Mozilla developers. Learn to this software. - &helpus.start;&helpus.middle;&helpus.end; + Want to help? Please consider or get involved with our of the Unified XUL Platform. @@ -141,7 +135,7 @@ - + &trademarkInfo.part1; -- cgit v1.2.3 From bc0273b478b2185ec51adc4a27db2e1b014a6dab Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 21 Oct 2017 16:39:52 +0200 Subject: Strip HHMM from the about dialog displayed version. --- browser/base/content/aboutDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 04384d584..f9571621f 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -50,7 +50,7 @@ function init(aEvent) let hour = buildID.slice(8, 10); let minute = buildID.slice(10, 12); if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { - versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + versionField.textContent = `${year}.${month}.${day}`; } else { versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; } -- cgit v1.2.3 From ee221138d4bbb5e6209d648a1a14cc176100963a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 00:04:26 +0100 Subject: Restore the dynamic release notes URL from pref --- browser/base/content/aboutDialog.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index b77896b95..f64e79681 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD -#expand + #endif -- cgit v1.2.3 From 3458dde44f5693ef2c1c2ff8b056fc1f4022701d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 26 Aug 2017 15:04:25 +0200 Subject: Add site-specific overrides and remove the overruling global. --- browser/components/nsBrowserGlue.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser') diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index d69a11f6b..f97c173a0 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -64,6 +64,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s ["Task", "resource://gre/modules/Task.jsm"], ["UITour", "resource:///modules/UITour.jsm"], ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"], + ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"], ["WebChannel", "resource://gre/modules/WebChannel.jsm"], ["WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"], ["webrtcUI", "resource:///modules/webrtcUI.jsm"], @@ -662,6 +663,8 @@ BrowserGlue.prototype = { } } catch (ex) { /* missing any of the prefs is not critical */ } + UserAgentOverrides.init(); + PageThumbs.init(); webrtcUI.init(); AboutHome.init(); @@ -1042,6 +1045,7 @@ BrowserGlue.prototype = { BrowserUsageTelemetry.uninit(); SelfSupportBackend.uninit(); + UserAgentOverrides.uninit(); PageThumbs.uninit(); NewTabMessages.uninit(); AboutNewTab.uninit(); -- cgit v1.2.3 From 6f96569b4499be07c210ca6c38739bbbc7ebdee7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 08:13:47 +0100 Subject: Set BASILISK_VERSION override major.minor to 52.9 --- browser/confvars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/confvars.sh b/browser/confvars.sh index 65cf154e9..0cccede38 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -18,7 +18,7 @@ if test "$OS_ARCH" = "WINNT"; then MOZ_MAINTENANCE_SERVICE= fi -# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release +# For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # builds so add-on developers have something to target while maintaining # Firefox compatiblity. # To enable add "export BASILISK_VERSION=1" to the .mozconfig file. @@ -26,7 +26,7 @@ fi # don't export the variable if you are in development or don't care. # When not exported we fall back the value in the version*.txt file. if test -n "$BASILISK_VERSION" ; then - MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'` + MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'` MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` else MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` -- cgit v1.2.3