Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits: 231850ac by Pier Angelo Vendrame at 2025-03-19T16:59:00+01:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js
TB 42720: Show what's new in the about:dialog.
Update our comment about app.releaseNotesURL.aboutDialog.
- - - - - de58bd66 by Pier Angelo Vendrame at 2025-03-19T16:59:03+01:00 fixup! BB 4234: Use the Firefox Update Process for Base Browser.
TB 42720: Show what's new in the about:dialog.
Add a BB_VERSION replacement to the URLFormatter service.
- - - - - 8f35f42f by Pier Angelo Vendrame at 2025-03-19T16:59:04+01:00 fixup! TB 2176: Rebrand Firefox to TorBrowser
TB 42720: Show what's new in the about:dialog.
Customize the "What's new" link and cleanup other channel-specific prefs.
- - - - - 8d7ba10b by Pier Angelo Vendrame at 2025-03-19T16:59:04+01:00 fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser
TB 42720: Show what's new in the about:dialog.
Add a variable for the base browser version without dot, as we use it in blog post URLs.
- - - - -
7 changed files:
- browser/app/profile/000-tor-browser.js - browser/base/content/aboutDialog.xhtml - browser/base/content/aboutDialogTor.css - browser/branding/tb-alpha/pref/firefox-branding.js - browser/branding/tb-nightly/pref/firefox-branding.js - browser/branding/tb-release/pref/firefox-branding.js - toolkit/components/urlformatter/URLFormatter.sys.mjs
Changes:
===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -1,14 +1,7 @@ #include 001-base-profile.js
pref("app.update.notifyDuringDownload", true); -pref("app.update.url.manual", "https://www.torproject.org/download/languages/"); -pref("app.update.url.details", "https://www.torproject.org/download/"); pref("app.update.badgeWaitTime", 0); -pref("app.releaseNotesURL", "about:blank"); -// disables the 'What's New?' link in the about dialog, otherwise we need to -// duplicate logic for generating the url to the blog post that is already more -// easily found in about:tor -pref("app.releaseNotesURL.aboutDialog", "about:blank"); // point to our feedback url rather than Mozilla's pref("app.feedback.baseURL", "https://support.torproject.org/%LOCALE%/misc/bug-or-feedback/");
===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -115,9 +115,9 @@ <!-- This HBOX is duplicated above without class="update" --> <hbox align="baseline"> <label id="version" class="update"/> - <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/> </hbox> <description class="text-blurb"> + <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/> <label is="text-link" onclick="openHelpLink('firefox-help')" data-l10n-id="aboutdialog-help-user"/> <label id="submit-feedback" is="text-link" onclick="openFeedbackPage()" data-l10n-id="aboutdialog-submit-feedback"/> </description>
===================================== browser/base/content/aboutDialogTor.css ===================================== @@ -26,6 +26,10 @@ margin-block: 10px; }
+#releasenotes { + margin-inline-end: .9em; /* Same as #submit-feedback */ +} + #contributeDesc { display: none; }
===================================== browser/branding/tb-alpha/pref/firefox-branding.js ===================================== @@ -10,30 +10,19 @@ // actions="showURL" // openURL="https://blog.torproject.org/tor-browser-55a2-released" pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); -pref("startup.homepage_welcome_url", "about:welcome"); -pref("startup.homepage_welcome_url.additional", ""); +pref("app.update.url.details", "https://www.torproject.org/download/alpha/"); +pref("app.update.url.manual", "https://www.torproject.org/download/alpha/"); +pref("app.releaseNotesURL", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_UR..."); +pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_UR..."); + // The time interval between checks for a new version (in seconds) pref("app.update.interval", 43200); // 12 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); -// URL user can browse to manually if for some reason all update installation -// attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/"); -// A default value for the "More information about this update" link -// supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/"); - -pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); - // The number of days a binary is permitted to be old // without checking for an update. This assumes that // app.update.checkInstallTime is true. pref("app.update.checkInstallTime.days", 2); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); - // Number of usages of the web console. // If this is less than 5, then pasting code into the web console is disabled pref("devtools.selfxss.count", 5);
===================================== browser/branding/tb-nightly/pref/firefox-branding.js ===================================== @@ -9,32 +9,20 @@ // each update manifest should contain attributes similar to: // actions="showURL" // openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); -pref("startup.homepage_welcome_url", "about:welcome"); -pref("startup.homepage_welcome_url.additional", ""); +pref("startup.homepage_override_url", "https://nightlies.tbb.torproject.org/"); +pref("app.update.url.details", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/"); +pref("app.update.url.manual", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/"); +pref("app.releaseNotesURL", "about:blank"); +pref("app.releaseNotesURL.aboutDialog", "about:blank"); + // The time interval between checks for a new version (in seconds) pref("app.update.interval", 14400); // 4 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); -// URL user can browse to manually if for some reason all update installation -// attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/?reason=manual-update"); -// A default value for the "More information about this update" link -// supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/"); - -pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); -pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); - // The number of days a binary is permitted to be old // without checking for an update. This assumes that // app.update.checkInstallTime is true. pref("app.update.checkInstallTime.days", 2); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); - // Number of usages of the web console. // If this is less than 5, then pasting code into the web console is disabled pref("devtools.selfxss.count", 5);
===================================== browser/branding/tb-release/pref/firefox-branding.js ===================================== @@ -10,43 +10,19 @@ // actions="showURL" // openURL="https://blog.torproject.org/tor-browser-55a2-released" pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); -pref("startup.homepage_welcome_url", "about:welcome"); -pref("startup.homepage_welcome_url.additional", ""); +pref("app.update.url.details", "https://www.torproject.org/download/"); +pref("app.update.url.manual", "https://www.torproject.org/download/"); +pref("app.releaseNotesURL", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/"); +pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/"); + // Interval: Time between checks for a new version (in seconds) pref("app.update.interval", 43200); // 12 hours // Give the user x seconds to react before showing the big UI. default=192 hours pref("app.update.promptWaitTime", 691200); -// app.update.url.manual: URL user can browse to manually if for some reason -// all update installation attempts fail. -// app.update.url.details: a default value for the "More information about this -// update" link supplied in the "An update is available" page of the update -// wizard. -#if MOZ_UPDATE_CHANNEL == beta - pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update"); - pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes"); - pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_sou..."); - pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_sou..."); -#elifdef MOZ_ESR - pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update"); - pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes"); - pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); - pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); -#else - pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update"); - pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes"); - pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); - pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=..."); -#endif - // The number of days a binary is permitted to be old // without checking for an update. This assumes that // app.update.checkInstallTime is true. pref("app.update.checkInstallTime.days", 63); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=4 days -pref("app.update.badgeWaitTime", 345600); - // Number of usages of the web console. // If this is less than 5, then pasting code into the web console is disabled pref("devtools.selfxss.count", 0);
===================================== toolkit/components/urlformatter/URLFormatter.sys.mjs ===================================== @@ -134,6 +134,16 @@ nsURLFormatterService.prototype = { DISTRIBUTION_VERSION() { return this.distribution.version; }, + BB_VERSION() { + return AppConstants.BASE_BROWSER_VERSION; + }, + BB_VERSION_FOR_URLS() { + let version = AppConstants.BASE_BROWSER_VERSION; + if (/^[0-9a.]+$/.test(version)) { + version = version.replaceAll(".", ""); + } + return version; + }, },
formatURL: function uf_formatURL(aFormat) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b0a250c...