diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 06:01:03 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 06:01:03 +0100 |
| commit | 63635e38ff9341c02fae7f4557d230ec710947b6 (patch) | |
| tree | 007459a8c21a0ed58051b177eb60a2e67aa429c5 /application/palemoon | |
| parent | 1626b5d7041ea9c3db92200f91542da46e49dde6 (diff) | |
| parent | 3c5a34c90075c8cee4be7d316f4b2d7390f7bc29 (diff) | |
| download | UXP-63635e38ff9341c02fae7f4557d230ec710947b6.tar UXP-63635e38ff9341c02fae7f4557d230ec710947b6.tar.gz UXP-63635e38ff9341c02fae7f4557d230ec710947b6.tar.lz UXP-63635e38ff9341c02fae7f4557d230ec710947b6.tar.xz UXP-63635e38ff9341c02fae7f4557d230ec710947b6.zip | |
Merge branch 'master' into Basilisk-releasev2018.11.07
Diffstat (limited to 'application/palemoon')
3 files changed, 28 insertions, 0 deletions
diff --git a/application/palemoon/components/places/content/editBookmarkOverlay.js b/application/palemoon/components/places/content/editBookmarkOverlay.js index 69d7d32eb..e3d4537c7 100644 --- a/application/palemoon/components/places/content/editBookmarkOverlay.js +++ b/application/palemoon/components/places/content/editBookmarkOverlay.js @@ -222,6 +222,11 @@ var gEditItemOverlay = { } let focusElement = () => { + let elt = document.querySelector("textbox:not([collapsed=true])"); + if (elt) { + elt.focus(); + elt.select(); + } this._initialized = true; }; diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul index d3d321b16..b12946f2a 100644 --- a/application/palemoon/components/preferences/security.xul +++ b/application/palemoon/components/preferences/security.xul @@ -50,6 +50,15 @@ name="security.cert_pinning.enforcement_level" type="int"/> + <!-- Opportunistic Encryption --> + + <preference id="network.http.upgrade-insecure-requests" + name="network.http.upgrade-insecure-requests" + type="bool"/> + <preference id="network.http.altsvc.oe" + name="network.http.altsvc.oe" + type="bool"/> + <!-- XSS Filter --> <!-- <preference id="security.xssfilter.enable" name="security.xssfilter.enable" type="bool"/> @@ -144,6 +153,16 @@ oncommand="gSecurityPane.updateHPKPPref();"/> </vbox> </groupbox> + + <groupbox id="OpportunisticEncryption"> + <caption label="&OpEnc.label;"/> + <checkbox id="enableUIROpEnc" + label="&enableUIROpEnc.label;" + preference="network.http.upgrade-insecure-requests" /> + <checkbox id="enableAltSvcOpEnc" + label="&enableAltSvcOpEnc.label;" + preference="network.http.altsvc.oe" /> + </groupbox> <!-- XSS Filter --> <!-- diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd index 2bd3b3aec..930736d56 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd @@ -40,6 +40,10 @@ <!ENTITY enableHPKP.label "Enable Certificate Key Pinning (HPKP)"> <!ENTITY enableHPKP.accesskey "C"> +<!ENTITY OpEnc.label "Opportunistic Encryption (OE)"> +<!ENTITY enableUIROpEnc.label "Enable Upgrade Insecure Requests"> +<!ENTITY enableAltSvcOpEnc.label "Enable HTTP Alternative Services for OE"> + <!ENTITY XSSFilt.label "XSS Filter"> <!ENTITY enableXSSFilt.label "Enable XSS filter"> <!ENTITY enableXSSFilt.accesskey "f"> |