Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

7 changed files:

Changes:

  • browser/app/profile/000-tor-browser.js
    1 1 
     #include 001-base-profile.js
    2 2
    3 3 
     pref("app.update.notifyDuringDownload", true);
    4 
    -pref("app.update.url.manual", "https://www.torproject.org/download/languages/");
    5 
    -pref("app.update.url.details", "https://www.torproject.org/download/");
    6 4 
     pref("app.update.badgeWaitTime", 0);
    7 
    -pref("app.releaseNotesURL", "about:blank");
    8 
    -// disables the 'What's New?' link in the about dialog, otherwise we need to
    9 
    -// duplicate logic for generating the url to the blog post that is already more
    10 
    -// easily found in about:tor
    11 
    -pref("app.releaseNotesURL.aboutDialog", "about:blank");
    12 5 
     // point to our feedback url rather than Mozilla's
    13 6 
     pref("app.feedback.baseURL", "https://support.torproject.org/%LOCALE%/misc/bug-or-feedback/");
    14 7

  • browser/base/content/aboutDialog.xhtml
    ... ... @@ -115,9 +115,9 @@
    115 115 
                   <!-- This HBOX is duplicated above without class="update" -->
    116 116 
                   <hbox align="baseline">
    117 117 
                     <label id="version" class="update"/>
    118 
    -                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
    119 118 
                   </hbox>
    120 119 
                   <description class="text-blurb">
    120 
    +                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
    121 121 
                     <label is="text-link" onclick="openHelpLink('firefox-help')" data-l10n-id="aboutdialog-help-user"/>
    122 122 
                     <label id="submit-feedback" is="text-link" onclick="openFeedbackPage()" data-l10n-id="aboutdialog-submit-feedback"/>
    123 123 
                   </description>

  • browser/base/content/aboutDialogTor.css
    ... ... @@ -26,6 +26,10 @@
    26 26 
       margin-block: 10px;
    27 27 
     }
    28 28
    29 
    +#releasenotes {
    30 
    +  margin-inline-end: .9em; /* Same as #submit-feedback */
    31 
    +}
    32 
    +
    29 33 
     #contributeDesc {
    30 34 
       display: none;
    31 35 
     }

  • browser/branding/tb-alpha/pref/firefox-branding.js
    ... ... @@ -10,30 +10,19 @@
    10 10 
     //   actions="showURL"
    11 11 
     //   openURL="https://blog.torproject.org/tor-browser-55a2-released"
    12 12 
     pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
    13 
    -pref("startup.homepage_welcome_url", "about:welcome");
    14 
    -pref("startup.homepage_welcome_url.additional", "");
    13 
    +pref("app.update.url.details", "https://www.torproject.org/download/alpha/");
    14 
    +pref("app.update.url.manual", "https://www.torproject.org/download/alpha/");
    15 
    +pref("app.releaseNotesURL", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_URLS%/");
    16 
    +pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_URLS%/");
    17 
    +
    15 18 
     // The time interval between checks for a new version (in seconds)
    16 19 
     pref("app.update.interval", 43200); // 12 hours
    17 20 
     // Give the user x seconds to react before showing the big UI. default=12 hours
    18 21 
     pref("app.update.promptWaitTime", 43200);
    19 
    -// URL user can browse to manually if for some reason all update installation
    20 
    -// attempts fail.
    21 
    -pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/");
    22 
    -// A default value for the "More information about this update" link
    23 
    -// supplied in the "An update is available" page of the update wizard.
    24 
    -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/");
    25 
    -
    26 
    -pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
    27 
    -
    28 22 
     // The number of days a binary is permitted to be old
    29 23 
     // without checking for an update.  This assumes that
    30 24 
     // app.update.checkInstallTime is true.
    31 25 
     pref("app.update.checkInstallTime.days", 2);
    32 
    -
    33 
    -// Give the user x seconds to reboot before showing a badge on the hamburger
    34 
    -// button. default=immediately
    35 
    -pref("app.update.badgeWaitTime", 0);
    36 
    -
    37 26 
     // Number of usages of the web console.
    38 27 
     // If this is less than 5, then pasting code into the web console is disabled
    39 28 
     pref("devtools.selfxss.count", 5);

  • browser/branding/tb-nightly/pref/firefox-branding.js
    ... ... @@ -9,32 +9,20 @@
    9 9 
     // each update manifest should contain attributes similar to:
    10 10 
     //   actions="showURL"
    11 11 
     //   openURL="https://blog.torproject.org/tor-browser-55a2-released"
    12 
    -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
    13 
    -pref("startup.homepage_welcome_url", "about:welcome");
    14 
    -pref("startup.homepage_welcome_url.additional", "");
    12 
    +pref("startup.homepage_override_url", "https://nightlies.tbb.torproject.org/");
    13 
    +pref("app.update.url.details", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/");
    14 
    +pref("app.update.url.manual", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/");
    15 
    +pref("app.releaseNotesURL", "about:blank");
    16 
    +pref("app.releaseNotesURL.aboutDialog", "about:blank");
    17 
    +
    15 18 
     // The time interval between checks for a new version (in seconds)
    16 19 
     pref("app.update.interval", 14400); // 4 hours
    17 20 
     // Give the user x seconds to react before showing the big UI. default=12 hours
    18 21 
     pref("app.update.promptWaitTime", 43200);
    19 
    -// URL user can browse to manually if for some reason all update installation
    20 
    -// attempts fail.
    21 
    -pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/?reason=manual-update");
    22 
    -// A default value for the "More information about this update" link
    23 
    -// supplied in the "An update is available" page of the update wizard.
    24 
    -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/");
    25 
    -
    26 
    -pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
    27 
    -pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
    28 
    -
    29 22 
     // The number of days a binary is permitted to be old
    30 23 
     // without checking for an update.  This assumes that
    31 24 
     // app.update.checkInstallTime is true.
    32 25 
     pref("app.update.checkInstallTime.days", 2);
    33 
    -
    34 
    -// Give the user x seconds to reboot before showing a badge on the hamburger
    35 
    -// button. default=immediately
    36 
    -pref("app.update.badgeWaitTime", 0);
    37 
    -
    38 26 
     // Number of usages of the web console.
    39 27 
     // If this is less than 5, then pasting code into the web console is disabled
    40 28 
     pref("devtools.selfxss.count", 5);

  • browser/branding/tb-release/pref/firefox-branding.js
    ... ... @@ -10,43 +10,19 @@
    10 10 
     //   actions="showURL"
    11 11 
     //   openURL="https://blog.torproject.org/tor-browser-55a2-released"
    12 12 
     pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
    13 
    -pref("startup.homepage_welcome_url", "about:welcome");
    14 
    -pref("startup.homepage_welcome_url.additional", "");
    13 
    +pref("app.update.url.details", "https://www.torproject.org/download/");
    14 
    +pref("app.update.url.manual", "https://www.torproject.org/download/");
    15 
    +pref("app.releaseNotesURL", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/");
    16 
    +pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/");
    17 
    +
    15 18 
     // Interval: Time between checks for a new version (in seconds)
    16 19 
     pref("app.update.interval", 43200); // 12 hours
    17 20 
     // Give the user x seconds to react before showing the big UI. default=192 hours
    18 21 
     pref("app.update.promptWaitTime", 691200);
    19 
    -// app.update.url.manual: URL user can browse to manually if for some reason
    20 
    -// all update installation attempts fail.
    21 
    -// app.update.url.details: a default value for the "More information about this
    22 
    -// update" link supplied in the "An update is available" page of the update
    23 
    -// wizard.
    24 
    -#if MOZ_UPDATE_CHANNEL == beta
    25 
    -  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update");
    26 
    -  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");
    27 
    -  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
    28 
    -  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
    29 
    -#elifdef MOZ_ESR
    30 
    -  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update");
    31 
    -  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes");
    32 
    -  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
    33 
    -  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
    34 
    -#else
    35 
    -  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update");
    36 
    -  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
    37 
    -  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
    38 
    -  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
    39 
    -#endif
    40 
    -
    41 22 
     // The number of days a binary is permitted to be old
    42 23 
     // without checking for an update.  This assumes that
    43 24 
     // app.update.checkInstallTime is true.
    44 25 
     pref("app.update.checkInstallTime.days", 63);
    45 
    -
    46 
    -// Give the user x seconds to reboot before showing a badge on the hamburger
    47 
    -// button. default=4 days
    48 
    -pref("app.update.badgeWaitTime", 345600);
    49 
    -
    50 26 
     // Number of usages of the web console.
    51 27 
     // If this is less than 5, then pasting code into the web console is disabled
    52 28 
     pref("devtools.selfxss.count", 0);

  • toolkit/components/urlformatter/URLFormatter.sys.mjs
    ... ... @@ -134,6 +134,16 @@ nsURLFormatterService.prototype = {
    134 134 
         DISTRIBUTION_VERSION() {
    135 135 
           return this.distribution.version;
    136 136 
         },
    137 
    +    BB_VERSION() {
    138 
    +      return AppConstants.BASE_BROWSER_VERSION;
    139 
    +    },
    140 
    +    BB_VERSION_FOR_URLS() {
    141 
    +      let version = AppConstants.BASE_BROWSER_VERSION;
    142 
    +      if (/^[0-9a\.]+$/.test(version)) {
    143 
    +        version = version.replaceAll(".", "");
    144 
    +      }
    145 
    +      return version;
    146 
    +    },
    137 147 
       },
    138 148
    139 149 
       formatURL: function uf_formatURL(aFormat) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help