From: Michael Kaply <consulting@kaply.com>
Date: Fri, 23 Mar 2018 19:34:40 +0000 (-0500)
Subject: Merge branch 'master' into 1433870_EnableTrackingProtection
X-Git-Tag: 0.9~31^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/b8c72d165052bc2ea433620858127018fa655d0c?ds=inline;hp=-c

Merge branch 'master' into 1433870_EnableTrackingProtection
---

b8c72d165052bc2ea433620858127018fa655d0c
diff --combined README.md
index 34d0bf5,ae374bb..8c9cdcc
--- a/README.md
+++ b/README.md
@@@ -27,6 -27,15 +27,15 @@@ This policy removes access to about:con
    }
  }
  ```
+ ### BlockAboutProfiles
+ This policy removes access to about:profiles.
+ ```
+ {
+   "policies": {
+     "BlockAboutProfiles": true
+   }
+ }
+ ```
  ### BlockAboutSupport
  This policy removes access to about:support.
  ```
@@@ -188,24 -197,6 +197,24 @@@ This policy stops Firefox from checkin
    }
  }
  ```
 +### EnableTrackingProtection
 +This policy affects tracking protection.
 +
 +If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
 +
 +If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
 +
 +If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
 +```
 +{
 +  "policies": {
 +    "EnableTrackingProtection": {
 +      "Value": [true, false],
 +      "Locked": [true, false]
 +    }
 +  }
 +}
 +```
  ### RememberPasswords
  This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
  ```
@@@ -289,8 -280,8 +298,8 @@@ same folder name are grouped together
      {"Title": "Example",
       "URL": "http://example.org",
       "Favicon": "http://example.com/favicon.ico",
-      "Placement": "toolbar",
-      "Folder": "Bookmarks"
+      "Placement": ["toolbar", "menu"],
+      "Folder": "FolderName"
       }
      ]
    }
diff --combined windows/en-US/firefox.adml
index e32018f,e1fab39..c259fcb
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -72,17 -72,11 +72,17 @@@
        <string id="Bookmark5">Bookmark 5</string>
        <string id="Bookmark_Explain">Bookmark Explanation</string>
        <string id="BookmarkPlacementToolbar">Toolbar</string>
-       <string id="BookmarkPlacementFolder">Folder</string>
+       <string id="BookmarkPlacementMenu">Menu</string>
        <string id="HomepageURL">URL for Home page</string>
        <string id="HomepageURL_Explain">Homepage Settings</string>
        <string id="HomepageAdditional">Additional Homepages</string>
        <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
 +      <string id="TrackingProtection">Tracking Protection</string>
 +      <string id="TrackingProtection_Explain">If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
 +
 +If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
 +
 +If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
      </stringTable>
      <presentationTable>
        <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@@ -91,9 -85,6 +91,9 @@@
        <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
        <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
        <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
 +      <presentation id="TrackingProtection">
 +        <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
 +      </presentation>
        <presentation id="HomepageURL">
          <text>URL:</text>
          <textBox refId="HomepageURL">
diff --combined windows/firefox.admx
index c393ef9,eb110e6..39f6038
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -58,6 -58,16 +58,16 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="BlockAboutProfiles" class="Both" displayName="$(string.BlockAboutProfiles)" explainText="$(string.BlockAboutProfiles_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutProfiles">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_WINXPSP2"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="BlockAboutSupport" class="Both" displayName="$(string.BlockAboutSupport)" explainText="$(string.BlockAboutSupport_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutSupport">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_WINXPSP2"/>
@@@ -238,26 -248,6 +248,26 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
 +    <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
 +      <parentCategory ref="firefox"/>
 +      <supportedOn ref="SUPPORTED_WINXPSP2"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +      <elements >
 +        <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
 +          <trueValue>
 +            <decimal value="1"/>
 +          </trueValue>
 +          <falseValue>
 +            <decimal value="0"/>
 +          </falseValue>
 +        </boolean>
 +      </elements>
 +    </policy>
      <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_WINXPSP2"/>
@@@ -346,9 -336,9 +356,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -368,9 -358,9 +378,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -390,9 -380,9 +400,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -412,9 -402,9 +422,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -434,9 -424,9 +444,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>