August 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40938: Copy tor-browser.ftl to the right place.
by boklm (＠boklm) 31 Aug '23

31 Aug '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 642eefd4 by Pier Angelo Vendrame at 2023-08-30T12:48:55+02:00 Bug 40938: Copy tor-browser.ftl to the right place. We started migrating to Fluent. Therefore, we have a new tor-browser.ftl file that we need to place in the right directory during the build. - - - - - 2 changed files: - projects/firefox/build - projects/translation/config Changes: ===================================== projects/firefox/build ===================================== @@ -138,6 +138,7 @@ mkdir "$HOME/.mozbuild" lang="ja" fi [% END -%] + mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$lang/browser/browser/" mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/" mv "$transl_tor_browser/$lang" "$torbutton_locales/" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" ===================================== projects/translation/config ===================================== @@ -18,7 +18,7 @@ steps: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 976a9c609d09666b67e5a7f530a5df7bad8b35ea + git_hash: 20f254a961574996496db5897aa06723bb79bce7 targets: nightly: git_hash: 'tor-browser' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] 2 commits: fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 30 Aug '23

30 Aug '23

Pier Angelo Vendrame pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0548dd50 by Pier Angelo Vendrame at 2023-08-30T14:43:07+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Move the alpha channel creation to a commit on its own - - - - - cd2ab905 by Pier Angelo Vendrame at 2023-08-30T14:46:26+02:00 Bug 42061: Create an alpha update channel. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22073e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22073e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] 2 commits: fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 30 Aug '23

30 Aug '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 625640a1 by Pier Angelo Vendrame at 2023-08-30T19:00:00+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Move the alpha channel creation to a commit on its own - - - - - 7eaa9c28 by Pier Angelo Vendrame at 2023-08-30T19:00:01+02:00 Bug 42061: Create an alpha update channel. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e2cb4a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e2cb4a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 41600: Add a tor circuit display panel.
by richard (＠richard) 30 Aug '23

30 Aug '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e2cb4a22 by Henry Wilkes at 2023-08-30T16:57:07+00:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41980: Center-align the circuit heading. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.css Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.css ===================================== @@ -39,14 +39,26 @@ } #tor-circuit-panel .panel-header { - /* .panel-header already has display: flex from panelUI-shared.css, but the - * direction is the default "row". */ + /* .panel-header already inherits these same rules from panelUI-shared.css and + * xul.css. But .panel-header is normally "flex-direction: row", but we are + * using a vbox (i.e flex-direction: column) so that the heading is placed + * vertically above the #tor-circuit-alias when it is shown. We want to + * ensure the layout rules we need for our different case so we are less + * vulnerable to changes in panelUI-shared.css. */ display: flex; flex-direction: column; align-items: center; + justify-content: center; text-align: center; } +.panel-header > h1#tor-circuit-heading { + /* Overwrite rule from panelUI-shared.css which gives this "flex: auto". + * Otherwise the heading will be stretched vertically and not be + * center-aligned. */ + flex: 0 0 auto; +} + #tor-circuit-alias:not([hidden]) { /* Same margin as .panel-header > h1 */ margin: 4px 0; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e2cb4a2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e2cb4a2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 30 Aug '23

30 Aug '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: f7b33748 by Henry Wilkes at 2023-08-30T16:55:18+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41651: Use moz-toggle for enable-bridges switch. - - - - - 3507dd2c by Henry Wilkes at 2023-08-30T16:55:18+00:00 fixup! Customize moz-toggle for tor-browser. Bug 41651: Use moz-toggle for enable-bridges switch. - - - - - 4 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/torPreferences.css - toolkit/content/widgets/moz-toggle/moz-toggle.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -99,7 +99,6 @@ const gConnectionPane = (function () { currentHeader: "#torPreferences-currentBridges-header", currentDescription: "#torPreferences-currentBridges-description", currentDescriptionText: "#torPreferences-currentBridges-descriptionText", - switchLabel: "#torPreferences-currentBridges-enableAll-label", switch: "#torPreferences-currentBridges-switch", cards: "#torPreferences-currentBridges-cards", cardTemplate: "#torPreferences-bridgeCard-template", @@ -391,11 +390,10 @@ const gConnectionPane = (function () { selectors.bridges.currentHeader ); bridgeHeader.textContent = TorStrings.settings.bridgeCurrent; - prefpane.querySelector(selectors.bridges.switchLabel).textContent = - TorStrings.settings.allBridgesEnabled; const bridgeSwitch = prefpane.querySelector(selectors.bridges.switch); - bridgeSwitch.addEventListener("change", () => { - TorSettings.bridges.enabled = bridgeSwitch.checked; + bridgeSwitch.setAttribute("label", TorStrings.settings.allBridgesEnabled); + bridgeSwitch.addEventListener("toggle", () => { + TorSettings.bridges.enabled = bridgeSwitch.pressed; TorSettings.saveToPrefs(); TorSettings.applySettings().then(result => { this._populateBridgeCards(); @@ -525,7 +523,7 @@ const gConnectionPane = (function () { strings.splice(index, 1); } TorSettings.bridges.enabled = - bridgeSwitch.checked && !!strings.length; + bridgeSwitch.pressed && !!strings.length; TorSettings.bridges.bridge_strings = strings.join("\n"); TorSettings.saveToPrefs(); TorSettings.applySettings().then(result => { @@ -642,7 +640,9 @@ const gConnectionPane = (function () { bridgeHeader.hidden = false; bridgeDescription.hidden = false; bridgeCards.hidden = false; - bridgeSwitch.checked = TorSettings.bridges.enabled; + // Changing the pressed property on moz-toggle should not trigger its + // "toggle" event. + bridgeSwitch.pressed = TorSettings.bridges.enabled; bridgeCards.classList.toggle("disabled", !TorSettings.bridges.enabled); bridgeCards.classList.toggle("single-card", numBridges === 1); ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -108,16 +108,10 @@ <html:span id="torPreferences-currentBridges-descriptionText" /> </description> <hbox align="center"> - <html:input - type="checkbox" + <html:moz-toggle id="torPreferences-currentBridges-switch" - class="toggle-button" + label-align-after="" /> - <html:label - id="torPreferences-currentBridges-enableAll-label" - for="torPreferences-currentBridges-switch" - > - </html:label> <spacer flex="1" /> <button id="torPreferences-currentBridges-removeAll" /> </hbox> ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -5,11 +5,6 @@ list-style-image: url("chrome://browser/content/torconnect/tor-connect.svg"); } -html:dir(rtl) input[type="checkbox"].toggle-button::before { - /* For some reason, the rule from toggle-button.css is not applied... */ - scale: -1; -} - /* Status */ #torPreferences-status-box { @@ -83,12 +78,6 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { font-weight: 700; } -#torPreferences-currentBridges-enableAll-label { - /* Block display to work with parent's xul box layout. */ - display: block; - margin-inline: 6px; -} - /* Bridge cards */ :root { --bridgeCard-animation-time: 0.25s; ===================================== toolkit/content/widgets/moz-toggle/moz-toggle.mjs ===================================== @@ -36,6 +36,8 @@ export default class MozToggle extends MozLitElement { accessKey: { type: String, attribute: "accesskey" }, // Extension for tor-browser. Used for tor-browser#41333. title: { type: String, attribute: "title" }, + // Extension for tor-browser. Used for tor-browser#40837. + labelAlignAfter: { type: Boolean, attribute: "label-align-after" }, }; static get queries() { @@ -119,9 +121,13 @@ export default class MozToggle extends MozLitElement { // accessible name derived from the label. const label = ariaLabel || this.label; const ariaDescription = label === this.title ? undefined : this.title; + // For tor-browser, we want to be able to place the label after the toggle + // as well. + // Used for the enable-bridges switch tor-browser#40837. + const labelAlignAfter = this.labelAlignAfter; return html` <link rel="stylesheet" href=${this.constructor.stylesheetUrl} /> - ${this.labelTemplate()} + ${labelAlignAfter ? "" : this.labelTemplate()} <button id="moz-toggle-button" part="button" @@ -136,6 +142,7 @@ export default class MozToggle extends MozLitElement { )} @click=${handleClick} ></button> + ${labelAlignAfter ? this.labelTemplate() : ""} ${this.descriptionTemplate()} `; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/db6f2f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/db6f2f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] 2 commits: fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 30 Aug '23

30 Aug '23

Pier Angelo Vendrame pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 36d58583 by Pier Angelo Vendrame at 2023-08-30T11:56:14+02:00 fixup! Base Browser strings Bug 41528: Added the version string for the about dialog - - - - - 22073ee8 by Pier Angelo Vendrame at 2023-08-30T11:56:20+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41528: Localized the version string in the about dialog - - - - - 3 changed files: - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - browser/locales/en-US/browser/base-browser.ftl Changes: ===================================== browser/base/content/aboutDialog.js ===================================== @@ -43,19 +43,12 @@ function init() { } // Include the build ID and display warning if this is an "a#" (nightly or aurora) build - let versionId = "aboutDialog-version"; + let versionId = "basebrowser-about-dialog-version"; let versionAttributes = { - version: AppConstants.MOZ_APP_VERSION_DISPLAY, - bits: Services.appinfo.is64Bit ? 64 : 32, + version: AppConstants.BASE_BROWSER_VERSION, + firefoxVersion: AppConstants.MOZ_APP_VERSION_DISPLAY, }; - // Adjust version text to show the fork version - versionAttributes.version = - AppConstants.BASE_BROWSER_VERSION + - " (based on Mozilla Firefox " + - AppConstants.MOZ_APP_VERSION_DISPLAY + - ")"; - let version = Services.appinfo.version; if (/a\d+$/.test(version)) { document.getElementById("experimental").hidden = false; ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -30,6 +30,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> + <html:link rel="localization" href="browser/base-browser.ftl"/> </linkset> <html:div id="aboutDialogContainer"> ===================================== browser/locales/en-US/browser/base-browser.ftl ===================================== @@ -23,3 +23,10 @@ basebrowser-rfp-restore-window-size-button-ak = R basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance + +## About dialog + +# "Mozilla Firefox" should be treated like a brand and it should be neither translated nor transliterated. +# $version (String) - The current browser version. E.g. "12.5.3". +# $firefoxVersion (String) - The version number of Firefox the current browser is based on. E.g. "102.15.0esr". +basebrowser-about-dialog-version = { $version } (based on Mozilla Firefox { $firefoxVersion }) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bcbb28… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bcbb28… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] 2 commits: fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 30 Aug '23

30 Aug '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 28d06463 by Pier Angelo Vendrame at 2023-08-30T11:39:48+02:00 fixup! Base Browser strings Bug 41528: Added the version string for the about dialog - - - - - db6f2f8f by Pier Angelo Vendrame at 2023-08-30T11:39:49+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41528: Localized the version string in the about dialog - - - - - 3 changed files: - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - browser/locales/en-US/browser/base-browser.ftl Changes: ===================================== browser/base/content/aboutDialog.js ===================================== @@ -43,19 +43,12 @@ function init() { } // Include the build ID and display warning if this is an "a#" (nightly or aurora) build - let versionId = "aboutDialog-version"; + let versionId = "basebrowser-about-dialog-version"; let versionAttributes = { - version: AppConstants.MOZ_APP_VERSION_DISPLAY, - bits: Services.appinfo.is64Bit ? 64 : 32, + version: AppConstants.BASE_BROWSER_VERSION, + firefoxVersion: AppConstants.MOZ_APP_VERSION_DISPLAY, }; - // Adjust version text to show the fork version - versionAttributes.version = - AppConstants.BASE_BROWSER_VERSION + - " (based on Mozilla Firefox " + - AppConstants.MOZ_APP_VERSION_DISPLAY + - ")"; - let version = Services.appinfo.version; if (/a\d+$/.test(version)) { document.getElementById("experimental").hidden = false; ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -36,6 +36,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> + <html:link rel="localization" href="browser/base-browser.ftl"/> </linkset> <html:div id="aboutDialogContainer"> ===================================== browser/locales/en-US/browser/base-browser.ftl ===================================== @@ -23,3 +23,10 @@ basebrowser-rfp-restore-window-size-button-ak = R basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance + +## About dialog + +# "Mozilla Firefox" should be treated like a brand and it should be neither translated nor transliterated. +# $version (String) - The current browser version. E.g. "12.5.3". +# $firefoxVersion (String) - The version number of Firefox the current browser is based on. E.g. "102.15.0esr". +basebrowser-about-dialog-version = { $version } (based on Mozilla Firefox { $firefoxVersion }) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e54d56… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e54d56… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 29 Aug '23

29 Aug '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e54d560b by Richard Pospesel at 2023-08-29T20:33:07+00:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -50,8 +50,7 @@ pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("security.nocertdb", true); -// Disk Activity Disable auto-downloaing to ~/Downloads and other download -// tweaks to minimize disk leaks (tor-browser#42050) +// Disk activity: download tweaks to minimize disk leaks (tor-browser#42050) pref("browser.download.useDownloadDir", false); pref("browser.download.always_ask_before_handling_new_types", true); pref("browser.download.manager.addToRecentDocs", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e54d560… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e54d560… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 29 Aug '23

29 Aug '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bcbb28ea by Richard Pospesel at 2023-08-29T20:32:16+00:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -50,8 +50,7 @@ pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("security.nocertdb", true); -// Disk Activity Disable auto-downloaing to ~/Downloads and other download -// tweaks to minimize disk leaks (tor-browser#42050) +// Disk activity: download tweaks to minimize disk leaks (tor-browser#42050) pref("browser.download.useDownloadDir", false); pref("browser.download.always_ask_before_handling_new_types", true); pref("browser.download.manager.addToRecentDocs", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bcbb28e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bcbb28e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 29 Aug '23

29 Aug '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 200f0ef8 by Richard Pospesel at 2023-08-29T20:29:40+00:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -50,9 +50,12 @@ pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("security.nocertdb", true); -// Disk activity: TBB Directory Isolation +// Disk Activity Disable auto-downloaing to ~/Downloads and other download +// tweaks to minimize disk leaks (tor-browser#42050) pref("browser.download.useDownloadDir", false); +pref("browser.download.always_ask_before_handling_new_types", true); pref("browser.download.manager.addToRecentDocs", false); +pref("browser.download.start_downloads_in_tmp_dir", true); // Prevent download stuffing / DOS (tor-browser#41764) pref("browser.download.enable_spam_prevention", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/200f0ef… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/200f0ef… You're receiving this email because of your account on gitlab.torproject.org.

1 0