Skip to content

Commit bf24619

Browse files
committed
resolved conflict in image files
2 parents 7868bc2 + abf9be2 commit bf24619

File tree

3,281 files changed

+55670
-48723
lines changed

Some content is hidden

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

3,281 files changed

+55670
-48723
lines changed

.github/workflows/stale.yml

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

.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@
128128
"branch": "master",
129129
"branch_mapping": {}
130130
},
131-
{
132-
"path_to_root": "azure-docs-snippets-pr",
133-
"url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
134-
"branch": "main",
135-
"branch_mapping": {}
136-
},
137131
{
138132
"path_to_root": "azure-functions-dapr-extension",
139133
"url": "https://github.com/Azure/azure-functions-dapr-extension",

.openpublishing.redirection.json

Lines changed: 5118 additions & 4481 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77
ms.service: azure-active-directory
88
ms.topic: how-to
9-
ms.date: 11/27/2023
9+
ms.date: 11/27/2024
1010
ms.author: godonnell
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77
ms.service: azure-active-directory
88
ms.topic: how-to
9-
ms.date: 03/22/2024
9+
ms.date: 01/10/2025
1010
ms.author: godonnell
1111
ms.subservice: b2c
1212
ms.custom: "b2c-support"

articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ If you reference a REST API technical profile directly from a user journey, the
244244

245245
## Development of your REST API
246246

247-
Your REST API can be developed on any platform and written in any programing language, as long as it's secure and can send and receive claims in JSON format.
247+
Your REST API can be developed on any platform and written in any programming language, as long as it's secure and can send and receive claims in JSON format.
248248

249249
The request to your REST API service comes from Azure AD B2C servers. The REST API service must be published to a publicly accessible HTTPS endpoint. The REST API call arrives from an Azure data center IP address.
250250

articles/active-directory-b2c/claimsschema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ The **DateTimeDropdown** user input type is used to provide a set of drop-downs
325325

326326
The **RadioSingleSelect** user input type is used to provide a collection of radio buttons that allows the user to select one option.
327327

328-
![Using claim type with radiodsingleselect](./media/claimsschema/radiosingleselect.png)
328+
![Using claim type with radiosingleselect](./media/claimsschema/radiosingleselect.png)
329329

330330
```xml
331331
<ClaimType Id="color">

articles/active-directory-b2c/configure-authentication-sample-angular-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Your final configuration file should look like the following JSON:
190190
```json
191191
{
192192
"credentials": {
193-
"tenantName": "<your-tenant-namee>",
193+
"tenantName": "<your-tenant-name>",
194194
"clientID": "<your-webapi-application-ID>",
195195
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
196196
},

articles/active-directory-b2c/configure-user-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77
ms.service: azure-active-directory
88
ms.topic: how-to
9-
ms.date: 12/13/2023
9+
ms.date: 12/13/2024
1010
ms.author: godonnell
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type

articles/active-directory-b2c/custom-policies-series-collect-user-input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,6 @@ After the policy finishes execution, you're redirected to `https://jwt.ms`, and
508508

509509
Next, learn:
510510

511-
- About [types of Technical Profiles](technicalprofiles.md#types-of-technical-profiles) in Azure AD B2C's custom policies.
511+
- About the [types of Technical Profiles](technicalprofiles.md#types-of-technical-profiles) in Azure AD B2C's custom policies.
512512

513-
- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).
513+
- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).

0 commit comments

Comments
 (0)