Skip to content

Commit

Permalink
Merge branch 'public' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
dstrome authored Aug 1, 2024
2 parents 00e25c7 + c3cf35e commit d9065d9
Show file tree
Hide file tree
Showing 85 changed files with 1,439 additions and 561 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/AutoLabelAssign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Assign and label PR

permissions:
pull-requests: write
contents: read
actions: read

on:
workflow_run:
workflows: [Background tasks]
types:
- completed

jobs:
download-payload:
name: Download and extract payload artifact
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
with:
WorkflowId: ${{ github.event.workflow_run.id }}
OrgRepo: ${{ github.repository }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}

label-assign:
name: Run assign and label
needs: [download-payload]
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
with:
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
AutoAssignUsers: 1
AutoLabel: 1
ExcludedUserList: '["user1", "user2"]'
ExcludedBranchList: '["branch1", "branch2"]'
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}






40 changes: 40 additions & 0 deletions .github/workflows/AutoLabelMsftContributor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Auto label Microsoft contributors

permissions:
pull-requests: write
contents: read
actions: read

on:
workflow_run:
workflows: [Background tasks]
types:
- completed

jobs:
download-payload:
if: github.repository_visibility == 'public'
name: Download and extract payload artifact
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
with:
WorkflowId: ${{ github.event.workflow_run.id }}
OrgRepo: ${{ github.repository }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}

label-msft:
name: Label Microsoft contributors
if: github.repository_visibility == 'public'
needs: [download-payload]
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
with:
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}






26 changes: 26 additions & 0 deletions .github/workflows/BackgroundTasks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Background tasks

permissions:
pull-requests: write
contents: read

on:
pull_request_target:

jobs:
upload:
runs-on: ubuntu-latest

steps:
- name: Save payload data
env:
PayloadJson: ${{ toJSON(github) }}
AccessToken: ${{ github.token }}
run: |
mkdir -p ./pr
echo $PayloadJson > ./pr/PayloadJson.json
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
- uses: actions/upload-artifact@v4
with:
name: PayloadJson
path: pr/
22 changes: 22 additions & 0 deletions .github/workflows/LiveMergeCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: PR can merge into branch

permissions:
pull-requests: write
statuses: write
contents: read

on:
pull_request_target:
types: [opened, reopened, synchronize, edited]

jobs:

live-merge:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}



22 changes: 22 additions & 0 deletions .github/workflows/PrFileCount.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: PR file count less than limit

permissions:
pull-requests: write
statuses: write
contents: read

on:
pull_request_target:
types: [opened, reopened, synchronize, labeled, unlabeled, edited]

jobs:

file-count:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}



20 changes: 20 additions & 0 deletions .github/workflows/ProtectedFiles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: PR has no protected files

permissions:
pull-requests: write
statuses: write
contents: read

on: [pull_request_target]

jobs:

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



9 changes: 8 additions & 1 deletion Viva/TOC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ items:
- name: Microsoft Viva language support
href: viva-language-support.md
- name: Use Organizational Data in Microsoft 365
href: organizational-data.md
href: organizational-data.md
items:
- name: Use organizational data in the Copilot dashboard
href: organizational-data-copilot.md
- name: Integrate Viva Glint and Viva Insights to maximize data insight (preview)
href: /viva/solutions/glint-insights-integration-overview
- name: Microsoft Viva privacy, security, and compliance
items:
- name: Overview
Expand All @@ -30,6 +35,8 @@ items:
items:
- name: Introduction to Copilot in Viva
href: copilot/viva-copilot-overview.md
- name: Control access to Copilot in Viva
href: copilot/copilot-access-management.md
- name: Deployment guides for Microsoft Viva
href: deployment-guides-for-microsoft-viva.md
- name: Self-help diagnostics for Viva administrators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ A SharePoint home site needs site navigation that is organized well, highlights

## Summary of web parts

> [!NOTE]
>
> Starting **September 1, 2024**, the feed for Viva Connection web part and the video news link will be removed and unavailable for SharePoint site editors to add to their sites. On **November 5, 2024**, support for the feed for Viva Connections web part and video news links will end and no longer display content.
>
> Site owners are encouraged to use the [News](https://support.microsoft.com/office/c2dcee50-f5d7-434b-8cb9-a7feefd9f165#bkmk_sitenews), [Viva Engage](https://support.microsoft.com/office/a53cfa0c-3d09-42c8-a286-1038a81c59da#highlights), [File and Media](/stream/streamnew/portals-single-video), and [Highlighted content](/stream/streamnew/portals-set-of-videos) web parts, and [Video pages](https://support.microsoft.com/office/7823449f-e2cc-48d2-bda7-2ee82518958a) as alternatives to using the feed for Viva Connections web part and the video news link. For more information, refer to the [Viva Connections Feed web part retirement support guidance documentation](feed-web-part-video-news-link-retirement.md).
|Image of the SharePoint home site |Web parts key |
|:---------|:---------|
|:::image type="content" source="../media/connections/vc-home-site-design-60.png" alt-text="SharePoint home site" lightbox="../media/connections/vc-home-site-design.png" border="false"::: |<ol><li>Hero web part</li><li>World clock web part</li><li>Weather web part</li><li>Feed for Viva Connections web part</li><li>Dashboard web part</li><li>Image web part</li><li>File viewer web part</li><li>Events web part</li><li>Quick Links web part</li><li>Quick Links web part</li><li>News web part</li><li>Quick Links web part</li><li>Call to action web part</li></ol>|
Expand Down
6 changes: 6 additions & 0 deletions Viva/connections/edit-viva-home.md
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,12 @@ You can import navigational links from a SharePoint home site and the SharePoint

## Learn more about how to influence content in the feed

> [!NOTE]
>
> Starting **September 1, 2024**, the feed for Viva Connection web part and the video news link will be removed and unavailable for SharePoint site editors to add to their sites. On **November 5, 2024**, support for the feed for Viva Connections web part and video news links will end and no longer display content.
>
> Site owners are encouraged to use the [News](https://support.microsoft.com/office/c2dcee50-f5d7-434b-8cb9-a7feefd9f165#bkmk_sitenews), [Viva Engage](https://support.microsoft.com/office/a53cfa0c-3d09-42c8-a286-1038a81c59da#highlights), [File and Media](/stream/streamnew/portals-single-video), and [Highlighted content](/stream/streamnew/portals-set-of-videos) web parts, and [Video pages](https://support.microsoft.com/office/7823449f-e2cc-48d2-bda7-2ee82518958a) as alternatives to using the feed for Viva Connections web part and the video news link. For more information, refer to the [Viva Connections Feed web part retirement support guidance documentation](feed-web-part-video-news-link-retirement.md).
There’s no configuration required to get the Feed working in the desktop or mobile apps. Content in the Feed can’t be edited because content is aggregated from across your Microsoft 365 environment. Content comes from multiple sources: organizational news published in SharePoint, industry news, meeting insights, and files and information from frequent collaborators.

The [Feed web part for Viva Connections](use-feed-web-part-for-viva-connections.md) displays the same content and can be added to other SharePoint sites. Content that is displayed in the Feed can’t be edited but the ranking can be influenced with the following actions:
Expand Down
Loading

0 comments on commit d9065d9

Please sign in to comment.