Skip to content

Commit bc4f626

Browse files
Merge branch 'master' into patch-3
2 parents 79d03d4 + 4e02047 commit bc4f626

File tree

3 files changed

+49
-9
lines changed

3 files changed

+49
-9
lines changed

skype/skype-ps/skype/New-CsTeamsMessagingPolicy.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ New-CsTeamsMessagingPolicy [-AllowOwnerDeleteMessage <Boolean>] [-AllowSmartRepl
2424
[-Tenant <Guid>] [-AllowImmersiveReader <Boolean>] [-AllowUserTranslation <Boolean>]
2525
[-AllowUserEditMessage <Boolean>] [-AudioMessageEnabledType <AudioMessageEnabledTypeEnum>] [-AllowRemoveUser <Boolean>]
2626
[-ReadReceiptsEnabledType <String>] [-AllowMemes <Boolean>] [-Confirm] [-AllowPriorityMessages <Boolean>]
27-
[-WhatIf] [-GiphyRatingType <String>] [-AllowGiphy <Boolean>]
27+
[-WhatIf] [-GiphyRatingType <String>] [-AllowGiphy <Boolean>] [-ChatPermissionRole <String>]
2828
```
2929

3030
## DESCRIPTION
@@ -382,6 +382,20 @@ Default value: None
382382
Accept pipeline input: False
383383
Accept wildcard characters: False
384384
```
385+
### -ChatPermissionRole
386+
Determines the Supervised Chat role of the user. Set this to Full to allow the user to supervise chats. Supervisors have the ability to initiate chats with and invite any user within the environment. Set this to Limited to allow the user to initiate conversations with Full and Limited permissioned users, but not Restricted. Set this to Restricted to block chat creation with anyone other than Full permissioned users.
387+
388+
```yaml
389+
Type: String
390+
Parameter Sets: (All)
391+
Aliases:
392+
393+
Required: False
394+
Position: Named
395+
Default value: Restricted
396+
Accept pipeline input: False
397+
Accept wildcard characters: False
398+
```
385399
386400
## INPUTS
387401
@@ -395,4 +409,3 @@ Accept wildcard characters: False
395409
## NOTES
396410
397411
## RELATED LINKS
398-

skype/skype-ps/skype/Set-CsTeamsClientConfiguration.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ The TeamsClientConfiguration allows IT admins to control the settings that can b
2121
### Identity (Default)
2222
```
2323
Set-CsTeamsClientConfiguration [-Tenant <System.Guid>] [-AllowEmailIntoChannel <Boolean>]
24-
[-RestrictedSenderList <String>] [-AllowDropBox <Boolean>] [-AllowEgnyte <Boolean>] [-AllowBox <Boolean>] [-AllowGoogleDrive <Boolean>]
24+
[-RestrictedSenderList <String>] [-AllowDropBox <Boolean>] [-AllowEgnyte <Boolean>] [-AllowBox <Boolean>] [-AllowGoogleDrive <Boolean>] [-AllowRoleBasedChatPermissions <Boolean>]
2525
[-AllowShareFile <Boolean>] [-AllowOrganizationTab <Boolean>] [-AllowSkypeBusinessInterop <Boolean>]
2626
[-AllowTBotProactiveMessaging <Boolean>] [-ContentPin <String>] [-AllowResourceAccountSendMessage <Boolean>]
2727
[-ResourceAccountContentAccess <String>] [-AllowGuestUser <Boolean>]
28-
[-AllowScopedPeopleSearchandAccess <Boolean>] [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm]
29-
[<CommonParameters>]
28+
[-AllowScopedPeopleSearchandAccess <Boolean>] [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm]
29+
[<CommonParameters>]
3030
```
3131

3232
### Instance
3333
```
3434
Set-CsTeamsClientConfiguration [-Tenant <System.Guid>] [-AllowEmailIntoChannel <Boolean>]
35-
[-RestrictedSenderList <String>] [-AllowDropBox <Boolean>] [-AllowEgnyte <Boolean>] [-AllowBox <Boolean>] [-AllowGoogleDrive <Boolean>]
35+
[-RestrictedSenderList <String>] [-AllowDropBox <Boolean>] [-AllowEgnyte <Boolean>] [-AllowBox <Boolean>] [-AllowGoogleDrive <Boolean>] [-AllowRoleBasedChatPermissions <Boolean>]
3636
[-AllowShareFile <Boolean>] [-AllowOrganizationTab <Boolean>] [-AllowSkypeBusinessInterop <Boolean>]
3737
[-AllowTBotProactiveMessaging <Boolean>] [-ContentPin <String>] [-AllowResourceAccountSendMessage <Boolean>]
3838
[-ResourceAccountContentAccess <String>] [-AllowGuestUser <Boolean>]
39-
[-AllowScopedPeopleSearchandAccess <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm]
40-
[<CommonParameters>]
39+
[-AllowScopedPeopleSearchandAccess <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm]
40+
[<CommonParameters>]
4141
```
4242

4343
## DESCRIPTION
@@ -180,6 +180,20 @@ Accept pipeline input: False
180180
Accept wildcard characters: False
181181
```
182182
183+
### -AllowRoleBasedChatPermissions
184+
When set to True, Supervised Chat is enabled for the tenant.
185+
186+
```yaml
187+
Type: Boolean
188+
Parameter Sets: (All)
189+
190+
Required: False
191+
Position: Named
192+
Default value: False
193+
Accept pipeline input: False
194+
Accept wildcard characters: False
195+
```
196+
183197
### -AllowScopedPeopleSearchandAccess
184198
If set to $true, the Exchange address book policy (ABP) will be used to provide customized view of the global address book for each user. This is only a virtual separation and not a legal separation.
185199
@@ -289,6 +303,7 @@ Accept wildcard characters: False
289303
290304
### -Identity
291305
The only valid input is Global - the tenant wide configuration.
306+
292307
```yaml
293308
Type: XdsIdentity
294309
Parameter Sets: Identity
@@ -383,6 +398,7 @@ Accept wildcard characters: False
383398
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
384399
For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).
385400
401+
386402
## INPUTS
387403
388404
### System.Management.Automation.PSObject

skype/skype-ps/skype/Set-CsTeamsMessagingPolicy.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Set-CsTeamsMessagingPolicy [-Tenant <Guid>] [-Description <String>] [-AllowUrlPr
2525
[-AllowStickers <Boolean>] [-AllowUserTranslation <Boolean>] [-AllowImmersiveReader <Boolean>]
2626
[-AllowRemoveUser <Boolean>] [-AllowPriorityMessages <Boolean>] [-AllowSmartReply <Boolean>] [-Allow [-ReadReceiptsEnabledType <String>]
2727
[-AudioMessageEnabledType <AudioMessageEnabledTypeEnum>] [-ChannelsInChatListEnabledType <ChannelsInChatListEnabledTypeEnum>]
28-
[[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
28+
[[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>] [-ChatPermissionRole <String>]
2929
```
3030

3131
### Instance
@@ -441,6 +441,17 @@ Accept pipeline input: False
441441
Accept wildcard characters: False
442442
```
443443
444+
### -ChatPermissionRole
445+
Determines the Supervised Chat role of the user. Set this to Full to allow the user to supervise chats. Supervisors have the ability to initiate chats with and invite any user within the enviornment. Set this to Limited to allow the user to initiate conversations with Full and Limited permissioned users, but not Restricted. Set this to Restricted to block chat creation with anyone other than Full permissioned users.
446+
447+
```yaml
448+
Type: String
449+
Position: Named
450+
Default value: Restricted
451+
Accept pipeline input: False
452+
Accept wildcard characters: False
453+
```
454+
444455
## INPUTS
445456
446457
### System.Management.Automation.PSObject

0 commit comments

Comments
 (0)