Skip to content

Commit 236f584

Browse files
yossi-karpyossi-karp
committed
Merge branch 'master' into streaming-fix-conflicts
2 parents caa4c9d + eb93220 commit 236f584

File tree

2,356 files changed

+41765
-25791
lines changed

Some content is hidden

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

2,356 files changed

+41765
-25791
lines changed

‎.openpublishing.publish.config.json

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,46 @@
151151
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152152
"branch": "master",
153153
"branch_mapping": {}
154-
},
154+
},
155+
{
156+
"path_to_root": "functions-quickstart-templates",
157+
"url": "https://github.com/Azure/azure-functions-templates",
158+
"branch": "dev"
159+
},
160+
{
161+
"path_to_root": "functions-docs-csharp",
162+
"url": "https://github.com/Azure-Samples/functions-docs-csharp",
163+
"branch": "master"
164+
},
165+
{
166+
"path_to_root": "functions-docs-javascript",
167+
"url": "https://github.com/Azure-Samples/functions-docs-javascript",
168+
"branch": "master"
169+
},
170+
{
171+
"path_to_root": "functions-docs-typescript",
172+
"url": "https://github.com/Azure-Samples/functions-docs-typescript",
173+
"branch": "master"
174+
},
175+
{
176+
"path_to_root": "functions-docs-python",
177+
"url": "https://github.com/Azure-Samples/functions-docs-python",
178+
"branch": "master"
179+
},
155180
{
181+
"path_to_root": "functions-docs-powershell",
182+
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
183+
"branch": "master"
184+
}, {
156185
"path_to_root": "samples-personalizer",
157186
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
158187
"branch": "master"
159188
},
189+
{
190+
"path_to_root": "samples-cognitive-services-data-files",
191+
"url": "https://github.com/Azure-Samples/cognitive-services-sample-data-files",
192+
"branch": "master"
193+
},
160194
{
161195
"path_to_root": "samples-luis",
162196
"url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",
@@ -312,6 +346,26 @@
312346
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
313347
"branch": "master"
314348
},
349+
{
350+
"path_to_root": "azure-sdk-for-java-event-hubs",
351+
"url": "https://github.com/Azure/azure-sdk-for-java/",
352+
"branch": "master"
353+
},
354+
{
355+
"path_to_root": "azure-sdk-for-java-script-event-hubs",
356+
"url": "https://github.com/Azure/azure-sdk-for-js/",
357+
"branch": "master"
358+
},
359+
{
360+
"path_to_root": "azure-sdk-for-net-event-hubs",
361+
"url": "https://github.com/Azure/azure-sdk-for-net/",
362+
"branch": "master"
363+
},
364+
{
365+
"path_to_root": "azure-sdk-for-python-event-hubs",
366+
"url": "https://github.com/Azure/azure-sdk-for-python/",
367+
"branch": "master"
368+
},
315369
{
316370
"path_to_root": "cosmos-dotnet-getting-started",
317371
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",

‎.openpublishing.redirection.json

Lines changed: 248 additions & 11 deletions
Large diffs are not rendered by default.

‎articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
href: code-samples.md
4949
- name: Concepts
5050
items:
51+
- name: Azure AD B2C best practices
52+
href: best-practices.md
5153
- name: Application types
5254
href: application-types.md
5355
- name: Authentication protocols

‎articles/active-directory-b2c/access-tokens.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Request an access token - Azure Active Directory B2C | Microsoft Docs
33
description: Learn how to request an access token from Azure Active Directory B2C.
44
services: active-directory-b2c
5-
author: mmacy
5+
author: msmimart
66
manager: celestedg
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
1111
ms.date: 04/16/2019
12-
ms.author: marsma
12+
ms.author: mimart
1313
ms.subservice: B2C
1414

1515
---

‎articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Define an Azure AD technical profile in a custom policy
33
titleSuffix: Azure AD B2C
44
description: Define an Azure Active Directory technical profile in a custom policy in Azure Active Directory B2C.
55
services: active-directory-b2c
6-
author: mmacy
6+
author: msmimart
77
manager: celestedg
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
1212
ms.date: 02/13/2020
13-
ms.author: marsma
13+
ms.author: mimart
1414
ms.subservice: B2C
1515
---
1616

‎articles/active-directory-b2c/add-native-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
title: Add a native client application - Azure Active Directory B2C | Microsoft Docs
33
description: Learn how to add a native client application to your Active Directory B2C tenant.
44
services: active-directory-b2c
5-
author: mmacy
5+
author: msmimart
66
manager: celestedg
77

8-
ms.author: marsma
8+
ms.author: mimart
99
ms.date: 02/04/2019
1010
ms.custom: mvc
1111
ms.topic: conceptual

‎articles/active-directory-b2c/add-web-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
title: Add a web API application - Azure Active Directory B2C | Microsoft Docs
33
description: Learn how to add a web API application to your Active Directory B2C tenant.
44
services: active-directory-b2c
5-
author: mmacy
5+
author: msmimart
66
manager: celestedg
77

8-
ms.author: marsma
8+
ms.author: mimart
99
ms.date: 04/16/2019
1010
ms.custom: mvc
1111
ms.topic: conceptual

‎articles/active-directory-b2c/analytics-with-application-insights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Track user behavior with Application Insights
33
titleSuffix: Azure AD B2C
44
description: Learn how to enable event logs in Application Insights from Azure AD B2C user journeys by using custom policies.
55
services: active-directory-b2c
6-
author: mmacy
6+
author: msmimart
77
manager: celestedg
88

99
ms.service: active-directory
1010
ms.topic: conceptual
1111
ms.workload: identity
1212
ms.date: 02/11/2020
13-
ms.author: marsma
13+
ms.author: mimart
1414
ms.subservice: B2C
1515

1616
---

‎articles/active-directory-b2c/application-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Application types supported by Azure AD B2C
33
titleSuffix: Azure AD B2C
44
description: Learn about the types of applications you can use with Azure Active Directory B2C.
55
services: active-directory-b2c
6-
author: mmacy
6+
author: msmimart
77
manager: celestedg
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
1212
ms.date: 07/24/2019
13-
ms.author: marsma
13+
ms.author: mimart
1414
ms.subservice: B2C
1515

1616
---

‎articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Authorization code flow - Azure Active Directory B2C | Microsoft Docs
33
description: Learn how to build web apps by using Azure AD B2C and OpenID Connect authentication protocol.
44
services: active-directory-b2c
5-
author: mmacy
5+
author: msmimart
66
manager: celestedg
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
1111
ms.date: 02/19/2019
12-
ms.author: marsma
12+
ms.author: mimart
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
1515
---

0 commit comments

Comments
 (0)