Skip to content

Commit

Permalink
Merge branch 'public' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
dstrome committed Jul 24, 2024
2 parents fef0031 + edd247e commit adbb9a5
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/AutoLabelAssign.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Auto label and assign pull requests
name: Assign and label PR

permissions:
pull-requests: write
Expand All @@ -8,7 +8,7 @@ on: [pull_request_target]

jobs:

auto-label-assign:
label-assign:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
Expand All @@ -20,4 +20,4 @@ jobs:
AccessToken: ${{ secrets.GITHUB_TOKEN }}




4 changes: 2 additions & 2 deletions .github/workflows/LiveMergeCheck.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check max/live-compare-merge below
name: PR can merge into branch

permissions:
pull-requests: write
Expand All @@ -12,7 +12,7 @@ on:
jobs:

live-merge:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-test
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/PrFileCount.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check max/pr-file-count below
name: PR file count less than limit

permissions:
pull-requests: write
Expand All @@ -12,7 +12,7 @@ on:
jobs:

file-count:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-test
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ProtectedFiles.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check max/protected-file-check below
name: PR has no protected files

permissions:
pull-requests: write
Expand All @@ -10,11 +10,11 @@ on: [pull_request_target]
jobs:

protected-files:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-test
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}




3 changes: 2 additions & 1 deletion Teams/devices/usb-devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,14 @@ If you're a manufacturer and want to join the certification program, see [How to

## Certified devices

*Table Updated June 2024*
*Table Updated July 2024*

> [!NOTE]
> The date format is MM/DD/YYYY.
| Manufacturer | Model | Qualified | Certified Program |
|:--------------------|:----------------------------------------------------------|:---------------|:-------------------------------------------------------|
|Yealink |WH64 Hybrid Dual/Mono Headset |7/23/2024 |Certified for Microsoft Teams |
|Yealink |WH64 Dual/Mono Headset |6/18/2024 |Certified for Microsoft Teams |
|Lenovo |Wireless VoIP Headset |5/21/2024 |Certified for Microsoft Teams |
|Logi |Zone 305 Headset |4/30/2024 |Certified for Microsoft Teams |
Expand Down
10 changes: 5 additions & 5 deletions Teams/general-teams-templates-in-the-admin-console.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Manage tasks, share documents, conduct project meetings and document risks and d
> [!div class="mx-tdBreakAll"]
> | Template type| TemplateId| Properties that come with this template |
> | ------------------|--|-----------------------------------------------------------|
> | Manage a Project |`com.microsoft.teams.template.ManageAProject`| Channels: <ul><li>General</li> <li>Announcements</li> <li>Resources</li> <li>Planning</li></ul> Apps:<ul><li>Approvals</li><li>Bulletins</li><li>Lists<ul><li>Project tracker</li><li>Issue tracker</li></ul></li><li>Milestones</li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li></ul></li><li>Tasks by Planner and To Do</li><li>Wiki</li></ul> |
> | Manage a Project |`com.microsoft.teams.template.ManageAProject`| Channels: <ul><li>General</li> <li>Announcements</li> <li>Resources</li> <li>Planning</li></ul> Apps:<ul><li>Approvals</li><li>Bulletins</li><li>Lists<ul><li>Project tracker</li><li>Issue tracker</li></ul></li><li>Milestones</li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li></ul></li><li>Planner</li><li>Wiki</li></ul> |
## Manage an Event*

Expand All @@ -58,7 +58,7 @@ You might not have access to certain apps based on your app permission policy.
> [!div class="mx-tdBreakAll"]
> | Template type | TemplateId| Properties that come with this template |
> | ------------------ |--|-----------------------------------------------------------|
> | Manage an Event|`com.microsoft.teams.template.ManageAnEvent` | Channels: <ul><li>General</li> <li>Announcements</li> <li>Budget</li> <li>Content</li><li>Logistics</li> <li>Planning</li> <li> Marketing and PR</li></ul> Apps:<ul><li>Approvals</li><li>Bulletins</li> <li>Employee ideas</li> <li>Lists<ul><li>Content scheduler</li></ul><li>Milestones</li></li> <li>OneNote</li> <li>Power Automate</li> <li>SharePoint Pages<ul><li>Our site</li><li>About our event</li></ul><li>Tasks by Planner and To Do</li><li>Wiki</li> |
> | Manage an Event|`com.microsoft.teams.template.ManageAnEvent` | Channels: <ul><li>General</li> <li>Announcements</li> <li>Budget</li> <li>Content</li><li>Logistics</li> <li>Planning</li> <li> Marketing and PR</li></ul> Apps:<ul><li>Approvals</li><li>Bulletins</li> <li>Employee ideas</li> <li>Lists<ul><li>Content scheduler</li></ul><li>Milestones</li></li> <li>OneNote</li> <li>Power Automate</li> <li>SharePoint Pages<ul><li>Our site</li><li>About our event</li></ul><li>Planner</li><li>Wiki</li> |
## Onboard Employees*

Expand All @@ -67,7 +67,7 @@ Improve your culture and streamline your employee onboarding with this central t
> [!div class="mx-tdBreakAll"]
> | Template type |TemplateId| Properties that come with this template |
> | ------------------|--|-----------------------------------------------------------|
> | Onboard Employees|`com.microsoft.teams.template.OnboardEmployees` | Channels: <ul><li>General</li> <li>Announcements</li> <li>Employee Chat</li> <li>Training</li></ul>Apps:<ul><li>Bulletins</li><li>Employee ideas</li><li>Lists<ul><li>Onboarding checklist</li></ul></li><li>Milestones</li><li>Power Automate</li> <li>SharePoint Pages<ul><li>Get started</li><li>Training</li></ul><li>Tasks by Planner and To Do</li><li>Viva Engage</li><li>Wiki</li></ul>|
> | Onboard Employees|`com.microsoft.teams.template.OnboardEmployees` | Channels: <ul><li>General</li> <li>Announcements</li> <li>Employee Chat</li> <li>Training</li></ul>Apps:<ul><li>Bulletins</li><li>Employee ideas</li><li>Lists<ul><li>Onboarding checklist</li></ul></li><li>Milestones</li><li>Power Automate</li> <li>SharePoint Pages<ul><li>Get started</li><li>Training</li></ul><li>Planner</li><li>Viva Engage</li><li>Wiki</li></ul>|
## Adopt Office 365

Expand All @@ -85,7 +85,7 @@ Collaborate on documentation, policy, and processes that support your help desk.
> [!div class="mx-tdBreakAll"]
> | Template type |TemplateId| Properties that come with this template |
> | ------------------|--|------------------------------------------------------------|
> | Organize Help Desk| `com.microsoft.teams.template.OrganizeHelpDesk`|Channels:<ul><li>General</li><li>Announcements</li><li>FAQ</li></ul>Apps:<ul><li>Issue reporting</li><li>Lists<ul><li>Devices</li><li>Tickets</li></ul></li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li><li>FAQs</li></ul></li><li>Tasks by Planner and To Do</li><li>Wiki</li></ul> |
> | Organize Help Desk| `com.microsoft.teams.template.OrganizeHelpDesk`|Channels:<ul><li>General</li><li>Announcements</li><li>FAQ</li></ul>Apps:<ul><li>Issue reporting</li><li>Lists<ul><li>Devices</li><li>Tickets</li></ul></li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li><li>FAQs</li></ul></li><li>Planner</li><li>Wiki</li></ul> |
## Crisis Communications*

Expand All @@ -94,7 +94,7 @@ Centralize communication and critical crisis resources for your crisis managemen
> [!div class="mx-tdBreakAll"]
> | Template type |TemplateId| Properties that come with this template |
> | ------------------ |--|----------------------------------------------------------|
> | Crisis Communications |`com.microsoft.teams.template.CollaborateOnAGlobalCrisisOrEvent`| Channels: <ul><li>General<li>Announcements</li><li>Executive Update</li><li>Planning</li><li>Logistics</li></ul>Apps: <ul><li>Approvals</li><li>Issue reporting</li><li>Lists<ul><li>Content scheduler</li><li>Project plan</li></ul></li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li><li>Latest update</li></ul><li>Tasks by Planner and To Do</li></ul>|
> | Crisis Communications |`com.microsoft.teams.template.CollaborateOnAGlobalCrisisOrEvent`| Channels: <ul><li>General<li>Announcements</li><li>Executive Update</li><li>Planning</li><li>Logistics</li></ul>Apps: <ul><li>Approvals</li><li>Issue reporting</li><li>Lists<ul><li>Content scheduler</li><li>Project plan</li></ul></li><li>OneNote</li><li>Power Automate</li><li>SharePoint Pages<ul><li>Our site</li><li>Latest update</li></ul><li>Planner</li></ul>|
## Related articles

Expand Down
Loading

0 comments on commit adbb9a5

Please sign in to comment.