Skip to content

Commit 0185faf

Browse files
authored
Merge branch 'main' into freshness-request-differences
2 parents 0b9a22e + 0890a15 commit 0185faf

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

api-reference/beta/resources/user.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ This resource supports:
168168
|[Upgrade app installed for user](../api/userteamwork-teamsappinstallation-upgrade.md) | None | Upgrades to the latest version of the app installed in the personal scope of a user.|
169169
|[Get chat between user and app](../api/userscopeteamsappinstallation-get-chat.md)| [Chat](chat.md)| Lists one-on-one chat between the user and the app. |
170170
|[List permission grants](../api/user-list-permissiongrants.md)| [resourceSpecificPermissionGrant](resourcespecificpermissiongrant.md) collection| List all [resource-specific permission grants](../resources/resourcespecificpermissiongrant.md) of a [user](../resources/user.md). |
171+
| **Terms of use agreements** |||
172+
| [Agreement acceptances for a user](../api/user-list-agreementacceptances.md) | [agreementAcceptance](agreementacceptance.md) | Retrieve a user's agreementAcceptance objects. |
171173
| **To-do tasks** |||
172174
|[List tasks](../api/todotasklist-list-tasks.md)|[todoTask](todotask.md) collection|Get all the [todoTask](todotask.md) resources in the specified list.|
173175
|[Create task](../api/todotasklist-post-tasks.md)|[todoTask](todotask.md)| Create a [todoTask](todotask.md) in the specified task list.|

api-reference/beta/toc/users/toc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@ items:
282282
href: ../../api/userscopeteamsappinstallation-get-chat.md
283283
- name: List permission grants
284284
href: ../../api/user-list-permissiongrants.md
285+
- name: Terms of use agreements
286+
items:
287+
- name: Agreement acceptances for a user
288+
href: ../../api/user-list-agreementacceptances.md
285289
- name: To-do tasks
286290
items:
287291
- name: List tasks

api-reference/v1.0/resources/user.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ This resource supports:
138138
| [Upgrade app installed for user](../api/userteamwork-teamsappinstallation-upgrade.md) | None | Upgrades to the latest version of the app installed in the personal scope of a user. |
139139
| [Get chat between user and app](../api/userscopeteamsappinstallation-get-chat.md) | [Chat](chat.md) | Lists one-on-one chat between the user and the app. |
140140
|[List permission grants](../api/user-list-permissiongrants.md)| [resourceSpecificPermissionGrant](resourcespecificpermissiongrant.md) collection| List all [resource-specific permission grants](../resources/resourcespecificpermissiongrant.md) of a [user](../resources/user.md). |
141+
| **Terms of use agreements** |||
142+
| [Agreement acceptances for a user](../api/user-list-agreementacceptances.md) | [agreementAcceptance](agreementacceptance.md) | Retrieve a user's agreementAcceptance objects. |
141143
| **To-do tasks** | | |
142144
| [List tasks](../api/todotasklist-list-tasks.md) | [todoTask](todotask.md) collection | Get all the [todoTask](todotask.md) resources in the specified list. |
143145
| [Create task](../api/todotasklist-post-tasks.md) | [todoTask](todotask.md) | Create a [todoTask](todotask.md) in the specified task list. |

api-reference/v1.0/toc/users/toc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ items:
234234
href: ../../api/userscopeteamsappinstallation-get-chat.md
235235
- name: List permission grants
236236
href: ../../api/user-list-permissiongrants.md
237+
- name: Terms of use agreements
238+
items:
239+
- name: Agreement acceptances for a user
240+
href: ../../api/user-list-agreementacceptances.md
237241
- name: To-do tasks
238242
items:
239243
- name: List tasks

concepts/toc.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ items:
293293
- name: Upgrade to the latest version
294294
href: toolkit/upgrade.md
295295
- name: Deploy with Bicep
296-
href: /graph/templates?context=graph/context
296+
href: /graph/templates?toc=/graph/toc.json
297297
- name: Services and features
298298
expanded: true
299299
items:
@@ -303,13 +303,13 @@ items:
303303
href: azuread-users-concept-overview.md
304304
displayName: users
305305
- name: Default user permissions
306-
href: /azure/active-directory/fundamentals/users-default-permissions?context=graph/context
306+
href: /entra/fundamentals/users-default-permissions?toc=/graph/toc.json
307307
- name: Profile photo settings
308308
href: profilephoto-configure-settings.md
309309
- name: Groups
310310
items:
311311
- name: Overview
312-
href: /graph/api/resources/groups-overview?context=graph/context
312+
href: /graph/api/resources/groups-overview?toc=/graph/toc.json
313313
displayName: groups
314314
- name: Microsoft 365 group behaviors and provisioning options
315315
href: group-set-options.md
@@ -321,10 +321,12 @@ items:
321321
href: applications-concept-overview.md
322322
- name: Applications and service principals
323323
items:
324+
- name: App manifest
325+
href: /entra/identity-platform/reference-microsoft-graph-app-manifest?toc=/graph/toc.json
324326
- name: Manage applications
325327
href: tutorial-applications-basics.md
326328
- name: Validation differences for signInAudience
327-
href: /azure/active-directory/develop/supported-accounts-validation?context=graph/context
329+
href: /entra/identity-platform/supported-accounts-validation?toc=/graph/toc.json
328330
- name: Grant or revoke permissions
329331
displayName: grant delegated and application permissions
330332
href: permissions-grant-via-msgraph.md
@@ -336,7 +338,7 @@ items:
336338
- name: Configure application proxy
337339
href: application-proxy-configure-api.md
338340
- name: Automate provisioning
339-
href: /azure/active-directory/app-provisioning/application-provisioning-configuration-api?context=graph/context
341+
href: /entra/identity/app-provisioning/application-provisioning-configuration-api?toc=/graph/toc.json
340342
- name: Generate proof of possession tokens for rolling keys
341343
href: application-rollkey-prooftoken.md
342344
- name: Authentication behaviors
@@ -621,7 +623,7 @@ items:
621623
- name: Identity and sign-in
622624
items:
623625
- name: Configure a custom claim provider token issuance event
624-
href: /azure/active-directory/develop/custom-extension-get-started?tabs=microsoft-graph?toc=/graph/toc.json&context=graph/context&tabs=microsoft-graph
626+
href: /entra/identity-platform/custom-extension-tokenissuancestart-configuration?tabs=microsoft-graph?toc=/graph/toc.json&tabs=microsoft-graph
625627
- name: Authentication methods
626628
href: authenticationmethods-get-started.md
627629
displayName: identity, authenticate, sign-in, sign in, signin
@@ -1168,7 +1170,7 @@ items:
11681170
displayName: Microsoft Graph error responses and error resource types
11691171
- name: Microsoft Entra service limits
11701172
displayName: Azure AD service limits and restrictions
1171-
href: /azure/active-directory/enterprise-users/directory-service-limits-restrictions?context=graph/context
1173+
href: /entra/identity/users/directory-service-limits-restrictions?toc=/graph/toc.json
11721174
- name: Migrate
11731175
items:
11741176
- name: Azure AD Graph

0 commit comments

Comments
 (0)