From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 20 May 2020 17:39:38 +0000 (-0500)
Subject: Merge branch 'master' into intune
X-Git-Tag: v1.17~8^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/70e84384e23250d321dbdb368559da114a6ef2b5?ds=inline;hp=--cc
Merge branch 'master' into intune
---
70e84384e23250d321dbdb368559da114a6ef2b5
diff --cc README.md
index 50fb47f,f51ef9a..c95e8f8
--- a/README.md
+++ b/README.md
@@@ -2701,58 -2208,9 +2767,60 @@@ Software\Policies\Mozilla\Firefox\Permi
Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org"
Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu"
+ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Default = "allow-audio-video" | "block-audio" | "block-audio-video"
+ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Locked = 0x1 | 0x0
```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Location/Location_BlockNewRequests
+```
+Value (string):
+```
+ or
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Location/Location_Locked
+```
+Value (string):
+```
+ or
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Notifications/Notifications_Allow
+```
+Value (string):
+```
+
+
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Notifications/Notifications_BlockNewRequests
+```
+Value (string):
+```
+ or
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Notifications/Notifications_Locked
+```
+Value (string):
+```
+ or
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Permissions~Autoplay/Autoplay_Allow
+```
+Value (string):
+```
+
+
+```
#### macOS
```