Skip to content

Commit 6456724

Browse files
authored
Merge branch 'main' into notes-api-beta-docs
2 parents ae0c295 + 54213db commit 6456724

30 files changed

Lines changed: 320 additions & 134 deletions

api-reference/beta/api/driveitem-get-content-format.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ GET /drive/root:/{path and filename}:/content?format={format}
4242

4343
| Parameter | Type | Description |
4444
|:----------|:-------|:---------------------------------------------------------------|
45-
| _format_ | string | Specify the format the item's content should be downloaded as. |
45+
| format | String | Specify the format the item's content should be downloaded as. |
46+
| height | Int32 | The desired height of the converted image in pixels. Required when `format=jpg`. |
47+
| width | Int32 | The desired width of the converted image in pixels. Required when `format=jpg`. |
4648

4749
The following values are valid for the **format** parameter:
4850

api-reference/beta/api/activities-list.md renamed to api-reference/beta/api/itemactivity-list.md

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
---
22
author: daspek
33
title: List activities
4-
description: "List the recent activities that took place on an item or under a hierarchy."
4+
description: "List the recent activities that took place on a drive, list, item, or within an item hierarchy."
55
ms.localizationpriority: medium
66
doc_type: apiPageType
77
ms.subservice: onedrive
88
ms.date: 04/04/2024
99
---
10-
# List activities (preview)
10+
# List activities
1111

1212
Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
List the recent [activities](../resources/itemactivity.md) that took place on an item or under a hierarchy.
16+
List the recent [activities](../resources/itemactivity.md) that took place on a [drive](../resources/drive.md), [list](../resources/list.md), item, or within an item hierarchy.
1717

18-
>**Note:** Activities is in a limited preview and is not yet available to all tenants.
1918

2019
[activities]: ../resources/itemactivity.md
2120

@@ -25,8 +24,8 @@ List the recent [activities](../resources/itemactivity.md) that took place on an
2524

2625
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2726

28-
<!-- { "blockType": "permissions", "name": "activities_list" } -->
29-
[!INCLUDE [permissions-table](../includes/permissions/activities-list-permissions.md)]
27+
<!-- { "blockType": "permissions", "name": "itemactivity_list" } -->
28+
[!INCLUDE [permissions-table](../includes/permissions/itemactivity-list-permissions.md)]
3029

3130
## HTTP request
3231

@@ -39,48 +38,21 @@ GET /sites/{site-id}/lists/{list-id}/activities
3938
GET /sites/{site-id}/lists/{list-id}/items/{item-id}/activities
4039
```
4140

41+
## Optional query parameters
42+
43+
This method doesn't support [OData query parameters](/graph/query-parameters) to customize the response.
44+
4245
## Example
4346

4447
### Request
4548

4649

47-
# [HTTP](#tab/http)
4850
<!-- { "blockType": "request", "name": "list-activities" } -->
4951

5052
```msgraph-interactive
5153
GET https://graph.microsoft.com/beta/me/drive/activities
5254
```
5355

54-
# [C#](#tab/csharp)
55-
[!INCLUDE [sample-code](../includes/snippets/csharp/list-activities-csharp-snippets.md)]
56-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
57-
58-
# [Go](#tab/go)
59-
[!INCLUDE [sample-code](../includes/snippets/go/list-activities-go-snippets.md)]
60-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
61-
62-
# [Java](#tab/java)
63-
[!INCLUDE [sample-code](../includes/snippets/java/list-activities-java-snippets.md)]
64-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
65-
66-
# [JavaScript](#tab/javascript)
67-
[!INCLUDE [sample-code](../includes/snippets/javascript/list-activities-javascript-snippets.md)]
68-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
69-
70-
# [PHP](#tab/php)
71-
[!INCLUDE [sample-code](../includes/snippets/php/list-activities-php-snippets.md)]
72-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
73-
74-
# [PowerShell](#tab/powershell)
75-
[!INCLUDE [sample-code](../includes/snippets/powershell/list-activities-powershell-snippets.md)]
76-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
77-
78-
# [Python](#tab/python)
79-
[!INCLUDE [sample-code](../includes/snippets/python/list-activities-python-snippets.md)]
80-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
81-
82-
---
83-
8456
### Response
8557

8658
<!-- { "blockType": "response", "@type": "Collection(microsoft.graph.itemActivity)", "truncated": true } -->

api-reference/beta/includes/permissions/activities-list-permissions.md renamed to api-reference/beta/includes/permissions/itemactivity-list-permissions.md

File renamed without changes.

api-reference/beta/resources/accesspackageapprovalstage.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,25 @@ Used for the **stages** property of approval settings in an [access package assi
2020
## Properties
2121
|Property|Type|Description|
2222
|:---|:---|:---|
23+
|approverInformationVisibility|[approverInformationVisibility](#approverinformationvisibility-values)|Indicates whether approver information is visible to the requestor. The possible values are: `default`, `notVisible`, `visible`, `unknownFutureValue`.|
2324
|durationBeforeAutomaticDenial|Duration|The number of days that a request can be pending a response before it is automatically denied.|
2425
|durationBeforeEscalation|Duration|If escalation is required, the time a request can be pending a response from a primary approver.|
25-
|escalationApprovers|[subjectSet](../resources/subjectset.md) collection|If escalation is enabled and the primary approvers do not respond before the escalation time, the escalationApprovers are the users who will be asked to approve requests. |
26+
|escalationApprovers|[subjectSet](../resources/subjectset.md) collection|If escalation is enabled and the primary approvers don't respond before the escalation time, the escalationApprovers are the users who will be asked to approve requests. |
2627
|fallbackEscalationApprovers|[subjectSet](../resources/subjectset.md) collection|The subjects, typically users, who are the fallback escalation approvers.|
2728
|fallbackPrimaryApprovers|[subjectSet](../resources/subjectset.md) collection|The subjects, typically users, who are the fallback primary approvers.|
28-
|approverInformationVisibility|[approverInformationVisibility](approverInformationVisibility.md)|Indicates whether approver information is visible to the requestor. The possible values are: `no`, `yes`, `default`, `unknownFutureValue`.|
2929
|isApproverJustificationRequired|Boolean|Indicates whether the approver is required to provide a justification for approving a request.|
3030
|isEscalationEnabled|Boolean|If `true`, then one or more **escalationApprovers** are configured in this approval stage.|
3131
|primaryApprovers|[subjectSet](../resources/subjectset.md) collection|The subjects, typically users, who will be asked to approve requests. A collection of [singleUser](singleuser.md), [groupMembers](groupmembers.md), [requestorManager](requestormanager.md), [internalSponsors](internalsponsors.md), [externalSponsors](externalsponsors.md), or [targetUserSponsors](targetusersponsors.md).|
3232

33+
### approverInformationVisibility values
34+
35+
| Member | Description |
36+
|:-------------------|:-------------------------------------------------------------------|
37+
| default | Use the default system setting for approver information visibility.|
38+
| notVisible | Approver information isn't visible to the requestor. |
39+
| visible | Approver information is visible to the requestor. |
40+
| unknownFutureValue | Evolvable enumeration sentinel value. Don't use. |
41+
3342
## Relationships
3443
None.
3544

api-reference/beta/resources/approvalstage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In PIM, defines the settings of the approval stages in a [unifiedRoleManagementP
2323
| Property | Type | Description |
2424
| :--------------------------- | :------------------------ | :---------- |
2525
| approvalStageTimeOutInDays |Int32 | The number of days that a request can be pending a response before it is automatically denied. |
26-
| approverInformationVisibility|[approverInformationVisibility](approverInformationVisibility.md) | Indicates whether approver information is visible to the requestor. The possible values are: `no`, `yes`, `default`, `unknownFutureValue`. |
26+
| approverInformationVisibility|[approverInformationVisibility](accesspackageapprovalstage.md#approverinformationvisibility-values) | Indicates whether approver information is visible to the requestor. The possible values are: `default`, `notVisible`, `visible`, `unknownFutureValue`. |
2727
| isApproverJustificationRequired |Boolean | Indicates whether the approver is required to provide a justification for approving a request. |
2828
| isEscalationEnabled |Boolean | If true, then one or more escalation approvers are configured in this approval stage. |
2929
| escalationTimeInMinutes |Int32 | If escalation is required, the time a request can be pending a response from a primary approver. |

api-reference/beta/resources/approverinformationvisibility.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

api-reference/beta/resources/drive.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Users without a OneDrive license may not have a default drive available.
2525
| [List drive][drive-list] | drive collection |Retrieve the list of drive resources available for a target user, group, or site.|
2626
| [Get drive][drive-get] | drive | Get metadata about a drive.|
2727
| [Get drive root][item-get] | [driveItem][] | Get root folder of a drive.|
28-
| [List activities][drive-activities] | [itemActivity][] collection | List activities that occurred under the drive.|
28+
| [List activities][drive-activities] | [itemActivity][] collection | List the recent [activities](../resources/itemactivity.md) that took place on a [drive](../resources/drive.md), [list](../resources/list.md), item, or within an item hierarchy. |
2929
| [List followed items][drive-following] | [driveItem][] collection | List the user's followed driveItems.|
3030
| [List children][item-children] | [driveItem][] collection | List children of the root folder of a drive.|
3131
| [List changes][item-changes] | [driveItem][] collection | List changes for all driveItems in the drive.|
@@ -129,7 +129,7 @@ The **drive** resource is derived from [**baseItem**](baseitem.md) and inherits
129129
[list]: list.md
130130
[quota-facet]: quota.md
131131
[drive-resource]: drive.md
132-
[drive-activities]: ../api/activities-list.md
132+
[drive-activities]: ../api/itemactivity-list.md
133133
[drive-following]: ../api/drive-list-following.md
134134
[drive-get]: ../api/drive-get.md
135135
[drive-list]: ../api/drive-list.md

api-reference/beta/resources/driveitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Items with the **folder** facet act as containers of items and therefore have a
4545
| [Get item](../api/driveitem-get.md) | [driveItem](../resources/driveitem.md) |Retrieve the metadata for a **driveItem** in a drive.|
4646
| [Get analytics][] | [itemAnalytics][] | Get analytics for this resource.|
4747
| [Get activities by interval][] | [itemActivityStat](../resources/itemactivitystat.md) | Get a collection of **itemActivityStats** within the specified time interval.|
48+
| [Get recent activities](../api/itemactivity-list.md) | [itemActivity](../resources/itemactivity.md) collection | List the recent [activities](../resources/itemactivity.md) that took place on a [drive](../resources/drive.md), [list](../resources/list.md), item, or within an item hierarchy. |
4849
| [List children](../api/driveitem-list-children.md) | [driveItem](../resources/driveitem.md) collection | Return a collection of **driveItems** in the children relationship of a **driveItem**.|
4950
| [List versions](../api/driveitem-list-versions.md) | [driveItemVersion][] collection | Retrieve the versions of a file in the current user's drive.|
5051
| [Create folder](../api/driveitem-post-children.md) | [driveItem](../resources/driveitem.md) | Create a **driveItem** in the specified drive.|
@@ -270,7 +271,6 @@ The **driveItem** resource is derived from [**baseItem**][baseItem] and inherits
270271
[itemReference]: itemreference.md
271272
[itemRetentionLabel]: itemretentionlabel.md
272273
[geoCoordinates]: geocoordinates.md
273-
[List activities]: ../api/activities-list.md
274274
[listItem]: listitem.md
275275
[malware]: malware.md
276276
[media]: media.md

api-reference/beta/resources/educationalactivitydetail.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ Represents more detail about an undergraduate, graduate, postgraduate degree, or
1818

1919
## Properties
2020

21-
| Property | Type | Description |
22-
|:-------------|:------------|:--------------------------------------------------------------|
23-
|abbreviation |String |Shortened name of the degree or program (example: PhD, MBA) |
24-
|activities |String |Extracurricular activities undertaken alongside the program. |
25-
|awards |String |Any awards or honors associated with the program. |
26-
|description |String |Short description of the program provided by the user. |
27-
|displayName |String |Long-form name of the program that the user provided. |
28-
|fieldsOfStudy |String |Majors and minors associated with the program. (if applicable) |
29-
|grade |String |The final grade, class, GPA, or score. |
30-
|notes |String |More notes the user provided. |
31-
|webUrl |String |Link to the degree or program page. |
21+
| Property | Type | Description |
22+
|:-------------|:-----------------|:--------------------------------------------------------------|
23+
|abbreviation |String |Shortened name of the degree or program, for example, `PhD` and `MBA`. |
24+
|activities |String collection |Extracurricular activities undertaken alongside the program. |
25+
|awards |String collection |Any awards or honors associated with the program. |
26+
|description |String |Short description of the program provided by the user. |
27+
|displayName |String |Long-form name of the program that the user provided. |
28+
|fieldsOfStudy |String collection |Majors and minors associated with the program, if applicable. |
29+
|grade |String |The final grade, class, grade point average (GPA), or score. |
30+
|notes |String |More notes provided by the user. |
31+
|webUrl |String |Link to the degree or program page. |
3232

3333
## JSON representation
3434

@@ -46,11 +46,11 @@ The following JSON representation shows the resource type.
4646
```json
4747
{
4848
"abbreviation": "String",
49-
"activities": "String",
50-
"awards": "String",
49+
"activities": ["String"],
50+
"awards": ["String"],
5151
"description": "String",
5252
"displayName": "String",
53-
"fieldsOfStudy": "String",
53+
"fieldsOfStudy": ["String"],
5454
"grade": "String",
5555
"notes": "String",
5656
"webUrl": "String"

api-reference/beta/resources/enums.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -969,15 +969,6 @@ Namespace: microsoft.graph
969969
| remoteDesktopToken |
970970
| refreshToken |
971971

972-
### approverInformationVisibility values
973-
974-
| Member |
975-
| ---- |
976-
| no |
977-
| yes |
978-
| default |
979-
| unknownFutureValue |
980-
981972
### protocolType values
982973

983974
| Member |

0 commit comments

Comments
 (0)