Skip to content

Commit 7cc9262

Browse files
VesaJuvonenVesaJuvonen
committed
Resolving merge conflict
2 parents ed31149 + 205a962 commit 7cc9262

File tree

117 files changed

+1661
-1978
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1661
-1978
lines changed

‎docs/apis/migration-api-azure-container-and-queue.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: SPO provided Migration Azure container and queue
33
description: "One of the Main requirement for using our Migration API is the usage of an Azure container as a temporary storage. We now provide a default container that can be used for using the migration API."
4-
ms.date: 06/28/2022
4+
ms.date: 07/08/2022
55
ms.author: jhendr
66
author: JoanneHendrickson
77
manager: pamgreen
@@ -10,7 +10,7 @@ ms.localizationpriority: medium
1010
---
1111
# SPO provided Migration Azure container and queue
1212

13-
Microsoft’s Migration API requires the use of an Azure container for temporary storage. To simplify the process, you are now provided with a default container while using the migration API. If you choose, you can still provide your own Azure container.
13+
Microsoft’s Migration API requires the use of an Azure container for temporary storage. To simplify the process, you are now provided with a default container while using the migration API. To use the provided container you will need to [decorate your traffic correctly](/sharepoint/dev/general-development/how-to-avoid-getting-throttled-or-blocked-in-sharepoint-online#how-to-decorate-your-http-traffic) to avoid throttling. If you choose, you can still provide your own Azure container.
1414

1515
## Encryption is required
1616

‎docs/declarative-customization/formatting-syntax-reference.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Formatting syntax reference
33
description: Formatting syntax reference
4-
ms.date: 06/28/2022
4+
ms.date: 08/03/2022
55
ms.localizationpriority: high
66
---
77

@@ -580,6 +580,8 @@ Operators specify the type of operation to perform. The following operators are
580580
- `"txtContent": "=cos(5)"` results in _0.28366218546322625_
581581
- **sin**: returns the sine of a number
582582
- `"txtContent": "=sin(90)"` results in _0.8939966636005579_
583+
- **toDateString()**: returns a date in a short-friendly format
584+
- `"txtContent": "=toDateString(@now)"` result doesn't vary based on user's locale and it will look like _"Wed Aug 03 2022"_
583585
- **toLocaleString()**: returns a language sensitive representation of a date
584586
- `"txtContent":"=toLocaleString(@now)"` results vary based on user's locale, but en-us looks like _"2/5/2019, 1:22:24 PM"_
585587
- **toLocaleDateString()**: returns a language sensitive representation of just the date portion of a date

‎docs/declarative-customization/site-design-json-schema.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Site template JSON schema
33
description: JSON schema reference for building site templates for SharePoint.
4-
ms.date: 06/28/2022
4+
ms.date: 07/28/2022
55
ms.localizationpriority: high
66
---
77

@@ -926,6 +926,9 @@ To enable the web scoped feature that allows for Events Lists to be created (fea
926926
Use the `triggerFlow` verb to kick off a custom flow.
927927
<!-- update this with example from trigger workflow topic -->
928928

929+
> [!TIP]
930+
> The article [Calling Power Automate from a site script](/sharepoint/dev/declarative-customization/site-design-trigger-flow-tutorial) provides an end-to-end example.
931+
929932
#### JSON values
930933

931934
- `url`: A trigger URL of the flow.

‎docs/declarative-customization/view-calendar-formatting.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Format calendar view to customize SharePoint
33
description: Customize calendar views in SharePoint lists and libraries
4-
ms.date: 06/28/2022
4+
ms.date: 07/01/2022
55
ms.localizationpriority: high
66
---
77

@@ -15,3 +15,30 @@ Groups the command bar customization options. For details on `commandBarProps`,
1515

1616
## See also
1717
- [Command bar customization syntax reference](./view-commandbar-formatting.md)
18+
19+
### Conditional view formatting based on a specific column
20+
21+
The following image shows an example of conditional formatting applied to a calendar view, based on a single choice column named **PROJECT**:
22+
23+
![SharePoint list calendar formatting](../images/calendar-view-formatting.png)
24+
25+
In this example, **PROJECT** column has the following options:
26+
- Project A
27+
- Project B
28+
- Project C
29+
- Project D
30+
- Project E
31+
32+
The JSON code below makes use of SharePoint Online Modern UI classes to apply colors, borders and a hover effect through the [Excel-style expression syntax](./formatting-syntax-reference.md#excel-style-expressions):
33+
34+
```JSON
35+
{
36+
"$schema": "https://developer.microsoft.com/json-schemas/sp/v2/calendar-formatting.schema.json",
37+
"additionalEventClass": "=if([$PROJECT] =='Project A' && @isSelected == false, 'sp-css-backgroundColor-successBackground50 sp-css-color-BlackText sp-css-borderColor-GreenText ms-bgColor-sharedGreenCyan10--hover ms-fontColor-white--hover', if([$PROJECT] =='Project A' && @isSelected == true, 'ms-bgColor-green sp-css-color-WhiteText', if([$PROJECT] =='Project B' && @isSelected == false, 'sp-css-backgroundColor-BgPeach sp-css-color-BlackText sp-css-borderColor-RedText ms-bgColor-sharedRed10--hover ms-fontColor-white--hover', if([$PROJECT] =='Project B' && @isSelected == true, 'sp-css-backgroundColor-redDark sp-css-color-WhiteText', if([$PROJECT] =='Project C' && @isSelected == false, 'sp-css-backgroundColor-BgGold sp-css-color-BlackText sp-css-borderColor-BrownText ms-bgColor-yellow--hover ms-fontColor-white--hover', if([$PROJECT] =='Project C' && @isSelected == true, 'ms-bgColor-sharedOrange10 sp-css-color-BlackText', if([$PROJECT] =='Project D' && @isSelected == false, 'ms-bgColor-communicationTint20 sp-css-color-BlackText sp-css-borderColor-BlueText ms-bgColor-sharedCyanBlue10--hover ms-fontColor-white--hover', if([$PROJECT] =='Project D' && @isSelected == true, 'sp-css-backgroundColor-BlueText sp-css-color-WhiteText', if([$PROJECT] =='Project E' && @isSelected == false, 'sp-css-backgroundColor-BgLilac sp-css-color-BlackText sp-css-borderColor-DarkPurpleText ms-bgColor-sharedBlueMagenta20--hover ms-fontColor-white--hover', if([$PROJECT] =='Project E' && @isSelected == true, 'sp-css-backgroundColor-BgPurple sp-css-color-WhiteText', if(@isSelected == false, 'sp-css-backgroundColor-neutralBackground20 sp-css-color-BlackText ms-bgColor-neutralTertiaryAlt--hover ms-fontColor-black--hover', 'sp-css-backgroundColor-neutralTertiary sp-css-color-WhiteText')))))))))))"
38+
}
39+
```
40+
<br>
41+
42+
The gif image below shows the final result:
43+
44+
![SharePoint list calendar formatting result](../images/calendar-view-formatting-result.gif)

‎docs/design/accessibility.md

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Accessibility in SharePoint web part design
33
description: Guidelines for adding accessibility to your web part.
4-
ms.date: 06/28/2022
4+
ms.date: 06/13/2022
55
ms.localizationpriority: medium
66
---
77
# Accessibility in SharePoint web part design
@@ -98,19 +98,61 @@ The following image shows theme colors on the left and neutral colors on the rig
9898

9999
![Neutral and Theme colors for minimum readable contrast](../images/themes-colors-blue-neutral-theme-2.png)
100100

101-
| Theme colors | Neutral colors |
102-
| ------------------------ | --------------------------- |
103-
| themeDarker: #004578 | black: #000000 |
104-
| themeDark: #005a9e | neutralDark: #212121 |
105-
| themeDarkAlt: #106ebe | neutralPrimary: #333 |
106-
| themePrimary: #0078d7 | neutralPrimaryAlt: #3c3c3c |
107-
| | neutralSecondary: #666666 |
108-
| | neutralTertiary: #a6a6a6 |
109-
| themeSecondary: #2b88d8 | neutralTertiaryAlt: #c8c8c8 |
110-
| themeTertiary: #71afe5 | neutralLight: #eaeaea |
111-
| themeLight: #c7e0f4 | neutralLighter: #f4f4f4 |
112-
| themeLighter: #deecf9 | neutralLighterAlt: #f8f8f8 |
113-
| themeLighterAlt: #eff6fc | white: #fff |
101+
<!--I replaced this image because it doesn't even make sense; the text to the right of each box does not match what's in the box, and none are labeled "theme."
102+
![Neutral and Theme colors for minimum readable contrast](../images/accessibility-illustration-12.png)-->
103+
104+
<br/>
105+
106+
<table>
107+
<tr>
108+
<th>Theme colors</th>
109+
<th>Neutral colors</th>
110+
</tr>
111+
<tr>
112+
<td style="color:white; background-color:#004578">themeDarker: #004578</td>
113+
<td style="color:white; background-color:#000000">black: #000000</td>
114+
</tr>
115+
<tr>
116+
<td style="color:white; background-color:#005a9e">themeDark: #005a9e</td>
117+
<td style="color:white; background-color:#212121">neutralDark: #212121</td>
118+
</tr>
119+
<tr>
120+
<td style="color:white; background-color:#106ebe">themeDarkAlt: #106ebe</td>
121+
<td style="color:white; background-color:#333">neutralPrimary: #333</td>
122+
</tr>
123+
<tr>
124+
<td rowspan="3" style="font-weight:bold; vertical-align:middle; color:white; background-color:#0078d7">themePrimary: #0078d7</td>
125+
<td style="color:white; background-color:#3c3c3c">neutralPrimaryAlt: #3c3c3c</td>
126+
</tr>
127+
<tr>
128+
<td style="color:white; background-color:#666666">neutralSecondary: #666666</td>
129+
</tr>
130+
<tr>
131+
<td style="color:black; background-color:#a6a6a6">neutralTertiary: #a6a6a6</td>
132+
</tr>
133+
<tr>
134+
<td style="color:white; background-color:#2b88d8">themeSecondary: #2b88d8</td>
135+
<td style="color:black; background-color:#c8c8c8">neutralTertiaryAlt: #c8c8c8</td>
136+
</tr>
137+
<tr>
138+
<td style="color:black; background-color:#71afe5">themeTertiary: #71afe5</td>
139+
<td style="color:black; background-color:#eaeaea">neutralLight: #eaeaea</td>
140+
</tr>
141+
<tr>
142+
<td style="color:black; background-color:#c7e0f4">themeLight: #c7e0f4</td>
143+
<td style="color:black; background-color:#f4f4f4">neutralLighter: #f4f4f4</td>
144+
</tr>
145+
<tr>
146+
<td style="color:black; background-color:#deecf9">themeLighter: #deecf9</td>
147+
<td style="color:black; background-color:#f8f8f8">neutralLighterAlt: #f8f8f8</td>
148+
</tr>
149+
<tr>
150+
<td style="color:black; background-color:#eff6fc">themeLighterAlt: #eff6fc</td>
151+
<td style="color:black; background-color:#fff">white: #fff</td>
152+
</tr>
153+
</table>
154+
155+
<br/>
114156

115157
## High contrast
116158

‎docs/docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"overwrite": [],
3535
"externalReference": [],
3636
"globalMetadata": {
37-
"uhfHeaderID": "MSDocsHeader-Dev_SharePoint",
37+
"uhfHeaderID": "MSDocsHeader-M365-IT",
3838
"extendBreadcrumb": "true",
3939
"breadcrumb_path":"/sharepoint/dev/breadcrumb/toc.json",
4040
"ms.suite": "office",

‎docs/general-development/customizing-ranking-models-to-improve-relevance-in-sharepoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Customizing ranking models to improve relevance in SharePoint
33
description: Improve search relevance by customizing ranking models to calculate rank scores (relevance rank) accurately using rank features in SharePoint.
4-
ms.date: 06/07/2022
4+
ms.date: 07/15/2022
55
ms.prod: sharepoint
66
ms.assetid: c166ecdd-7f93-4bbb-b543-2687992dd2bc
77
ms.localizationpriority: high
@@ -133,7 +133,7 @@ To retrieve the rank detail, you need to be the administrator of the Search serv
133133
### To retrieve the rank detail
134134

135135
1. Open the SharePoint Management Shell as an Administrator.
136-
1. Run the following sequence of Windows PowerShell cmdlets, and substitute _\<query_text\>_ and _<url>_ with actual values.
136+
1. Run the following sequence of Windows PowerShell cmdlets, and substitute _\<query_text\>_ and _\<url\>_ with actual values.
137137

138138
```powershell
139139
$app = Get-SPEnterpriseSearchServiceApplication

‎docs/images/calendar-view-formatting-result.gif

434 KB
Loading

‎docs/images/calendar-view-formatting.png

54.8 KB
Loading

‎docs/schema/accountauthcredentials-element-sps15xsdsearchset2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
22
title: "AccountAuthCredentials element (SPS15XSDSearchSet2)"
33
manager: arnek
4-
ms.date: 3/9/2015
4+
ms.date: 07/15/2022
55
ms.audience: ITPro
66
ms.topic: article
77
ms.localizationpriority: medium
88
ms.assetid: 129a629d-9956-6516-c101-777230bb5461
9-
description: "Last modified: March 09, 2015"
9+
description: "Describes the AccountAuthCredentials element (SPS15XSDSearchSet2) information, definition, elements, and attributes."
1010
---
1111

1212
# AccountAuthCredentials element (SPS15XSDSearchSet2)
1313

1414
## Element information
1515

16-
|||
16+
|| Value |
1717
|:-----|:-----|
1818
|**Element type** <br/> |tns:AccountAuthCredentials <br/> |
1919
|**Namespace** <br/> |http://schemas.datacontract.org/2004/07/Microsoft.Office.Server.Search.Administration <br/> |

0 commit comments

Comments
 (0)