X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/528fd2d1c69be561cc397f8a83ac87cdd55d1789..5ec06c57eedfbb1d196d6a36ebef6d07f8dcfddc:/windows/firefox.admx?ds=sidebyside

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 0823d55..2df5798 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="6.0" schemaVersion="1.0">
+<policyDefinitions revision="6.5" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="6.0"/>
+  <resources minRequiredRevision="6.5"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -75,6 +75,9 @@
       <definition name="SUPPORTED_FF128" displayName="$(string.SUPPORTED_FF128)"/>
       <definition name="SUPPORTED_FF129" displayName="$(string.SUPPORTED_FF129)"/>
       <definition name="SUPPORTED_FF130" displayName="$(string.SUPPORTED_FF130)"/>
+      <definition name="SUPPORTED_FF130_ONLY" displayName="$(string.SUPPORTED_FF130_ONLY)"/>
+      <definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>
+      <definition name="SUPPORTED_FF136_ONLY" displayName="$(string.SUPPORTED_FF136_ONLY)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -3696,6 +3699,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="UserMessaging_FirefoxLabs" class="Both" displayName="$(string.UserMessaging_FirefoxLabs)" explainText="$(string.UserMessaging_FirefoxLabs)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="FirefoxLabs">
+      <parentCategory ref="UserMessaging"/>
+      <supportedOn ref="SUPPORTED_FF130_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="UserMessaging_Locked" class="Both" displayName="$(string.UserMessaging_Locked)" explainText="$(string.UserMessaging_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="Locked">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75"/>
@@ -4273,23 +4286,53 @@
         <list id="List" key="Software\Policies\Mozilla\Firefox\HttpAllowlist" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="PrivateBrowsingModeAvailability" class="Both" displayName="$(string.PrivateBrowsingModeAvailability)" explainText="$(string.PrivateBrowsingModeAvailability_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.PrivateBrowsingModeAvailability)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF130"/>
+      <elements>
+        <enum id="PrivateBrowsingModeAvailability" valueName="PrivateBrowsingModeAvailability">
+          <item displayName="$(string.PrivateBrowsingModeAvailability_0)">
+            <value>
+              <decimal value="0"/>
+            </value>
+          </item>
+          <item displayName="$(string.PrivateBrowsingModeAvailability_1)">
+            <value>
+              <decimal value="1"/>
+            </value>
+          </item>
+          <item displayName="$(string.PrivateBrowsingModeAvailability_2)">
+            <value>
+              <decimal value="2"/>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="ContentAnalysis_AgentName" class="Both" displayName="$(string.ContentAnalysis_AgentName)" explainText="$(string.ContentAnalysis_AgentName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
+      <parentCategory ref="ContentAnalysis"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
+      <elements>
+        <text id="String" valueName="AgentName"/>
+      </elements>
+    </policy>
     <policy name="ContentAnalysis_AgentTimeout" class="Both" displayName="$(string.ContentAnalysis_AgentTimeout)" explainText="$(string.ContentAnalysis_AgentTimeout_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.Number)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <decimal id="Number" valueName="AgentTimeout"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AllowUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_AllowUrlRegexList)" explainText="$(string.ContentAnalysis_AllowUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <text id="String" valueName="AllowUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_BypassForSameTabOperations" class="Both" displayName="$(string.ContentAnalysis_BypassForSameTabOperations)" explainText="$(string.ContentAnalysis_BypassForSameTabOperations_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="BypassForSameTabOperations">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -4299,14 +4342,14 @@
     </policy>
     <policy name="ContentAnalysis_ClientSignature" class="Both" displayName="$(string.ContentAnalysis_ClientSignature)" explainText="$(string.ContentAnalysis_ClientSignature_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <text id="String" valueName="ClientSignature"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_DefaultResult" class="Both" displayName="$(string.ContentAnalysis_DefaultResult)" explainText="$(string.ContentAnalysis_DefaultResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.ContentAnalysis_DefaultResult)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF60"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <enum id="ContentAnalysis_DefaultResult" valueName="DefaultResult">
           <item displayName="$(string.ContentAnalysis_DefaultResult_0)">
@@ -4329,14 +4372,14 @@
     </policy>
     <policy name="ContentAnalysis_DenyUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_DenyUrlRegexList)" explainText="$(string.ContentAnalysis_DenyUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <text id="String" valueName="DenyUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_Enabled" class="Both" displayName="$(string.ContentAnalysis_Enabled)" explainText="$(string.ContentAnalysis_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="Enabled">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -4346,7 +4389,7 @@
     </policy>
     <policy name="ContentAnalysis_IsPerUser" class="Both" displayName="$(string.ContentAnalysis_IsPerUser)" explainText="$(string.ContentAnalysis_IsPerUser_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="IsPerUser">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -4356,14 +4399,14 @@
     </policy>
     <policy name="ContentAnalysis_PipePathName" class="Both" displayName="$(string.ContentAnalysis_PipePathName)" explainText="$(string.ContentAnalysis_PipePathName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <elements>
         <text id="String" valueName="PipePathName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_ShowBlockedResult" class="Both" displayName="$(string.ContentAnalysis_ShowBlockedResult)" explainText="$(string.ContentAnalysis_ShowBlockedResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="ShowBlockedResult">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF136_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>