Resolve syncing conflicts from live-sync-work to live#1646

Closed

openpublishbuild wants to merge 4361 commits intolivefrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 24, 2020

Commits on Nov 25, 2020

Create bot-service-debug-adaptive-tool.md
Emily Olshefski
committed
Added links to debug with adaptive tool article
Emily Olshefski
committed
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Emily Olshefski
authored
Update bot-service-debug-adaptive-tool.md
Emily Olshefski
authored
Update bot-service-debug-adaptive-tool.md
Emily Olshefski
authored
Update bot-builder-howto-proactive-message.md
JonathanFingold
committed

Commits on Nov 30, 2020

Fix typo
JonathanFingold
committed
Fixed content.
Michael Miele
committed
Update bot-service-channel-directline-extension-net-bot.md
Michael Miele
committed

Commits on Dec 1, 2020

Incoroporate John's feedback
JonathanFingold
committed
Update bot-service-debug-adaptive-tool.md
Emily Olshefski
authored
Update bot-service-debug-adaptive-tool.md
Emily Olshefski
authored
Update bot-service-debug-adaptive-tool.md
Emily Olshefski
authored
Update TOC.yml
Emily Olshefski
authored
Update adaptive-expressions-prebuilt-functions.md
Emily Olshefski
committed
Update adaptive-expressions-prebuilt-functions.md
Emily Olshefski
authored
Address John's feedback
JonathanFingold
committed
Merge pull request #2481 from MicrosoftDocs/jf/proactive-1124
JonathanFingold
authored
Merge branch 'master' into mm-bot-issue-1958
JonathanFingold
authored
Merge pull request #2483 from MicrosoftDocs/mm-bot-issue-1958
JonathanFingold
authored

Commits on Dec 2, 2020

Added image and fixed content to explain trusted origins based on a discussion with Jonathan.
Michael Miele
committed
Chnaged new articel title and fixed related links.
Michael Miele
committed
Fixed based on CK feedback
Michael Miele
committed
Update C# quickstart post R11
JonathanFingold
committed
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold
authored
Update bot-service-resources-faq-security.md
Michael Miele
committed
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-enhanced-dl-oauth
Michael Miele
committed
Fix links
JonathanFingold
committed
fix more links
JonathanFingold
committed
Fix one more link
JonathanFingold
committed
Update bot-service-resources-faq-security.md
Michael Miele
committed

Commits on Dec 3, 2020

Merge pull request #2485 from MicrosoftDocs/jf/cs-templates-r11
JonathanFingold
authored
Added new FAQ entry
Michael Miele
committed
Apply suggestions from code review

Michael Miele
and
JonathanFingold
authored
Update bot-builder-security-enhanced.md
Michael Miele
committed
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-enhanced-dl-oauth
Michael Miele
committed
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold
authored
Merge pull request #2472 from MicrosoftDocs/mm-bot-enhanced-dl-oauth
JonathanFingold
authored
Update bot-service-channel-connect-directline.md
Michael Miele
committed
Update bot-service-channel-connect-directline.md
Michael Miele
committed
Update bot-service-channel-connect-directline.md
Michael Miele
committed

Commits on Dec 4, 2020

Removed link syntax.
jdmartinez36
committed

Commits on Dec 7, 2020

Commits on Dec 8, 2020

Update TOC.yml
Michael Miele
committed
Update TOC.yml
Michael Miele
committed
Update bot-service-resources-faq-general.md
Michael Miele
committed

Commits on Dec 9, 2020

Update bot-builder-howto-add-media-attachments.md
Michael Miele
committed
Update bot-builder-howto-add-media-attachments.md
Michael Miele
committed
Merge pull request #2492 from MicrosoftDocs/mm-bot-security-toc-improvement
JonathanFingold
authored
Merge branch 'master' into mm-bot-add-faq-entry
JonathanFingold
authored
Merge pull request #2486 from MicrosoftDocs/mm-bot-add-faq-entry
JonathanFingold
authored
fixed link to iso 8601 wiki page
Emily Olshefski
committed
Update bot-service-troubleshoot-general-problems.md
Michael Miele
committed
Add installation update info
JonathanFingold
committed
fix link
JonathanFingold
committed
Update articles/bot-service-troubleshoot-general-problems.md

Michael Miele
and
Emily Olshefski
authored
Merge pull request #2493 from MicrosoftDocs/jf/activity-handler-1209
JonathanFingold
authored
Update bot-service-channel-connect-email.md
Michael Miele
committed
Update bot-service-channel-connect-email.md
Michael Miele
committed

Commits on Dec 10, 2020

Update bot-service-channel-connect-email.md
Michael Miele
committed
Update snippet-channeldata.md
Michael Miele
committed
Update bot-service-channel-connect-email.md
Michael Miele
committed

Commits on Dec 11, 2020

Fixed include file, shared this file . fixed content
Michael Miele
committed
Update snippet-channeldata.md
Michael Miele
committed
Fixed content
Michael Miele
committed
Fixed content
Michael Miele
committed
Update snippet-channelData-email.md
Michael Miele
committed
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1927
Emily Olshefski
authored

Commits on Dec 14, 2020

Fixed content based on feedback. Added images.
Michael Miele
committed
Update bot-service-troubleshoot-general-problems.md
Michael Miele
committed
Update bot-service-troubleshoot-general-problems.md
Michael Miele
committed

Commits on Dec 15, 2020

Fixed content and added a couple of supporting images.
Michael Miele
committed
Fixed image
Michael Miele
committed
Merge branch 'master' into mm-email-channeldata-schema
JonathanFingold
authored
Update bot-service-channel-directline.md
Michael Miele
committed

Commits on Dec 17, 2020

Commits on Dec 18, 2020

Commits on Dec 21, 2020

Update articles/bot-service-troubleshoot-general-problems.md

Michael Miele
and
JonathanFingold
authored
Apply suggestions from code review

Michael Miele
and
JonathanFingold
authored
Update bot-service-troubleshoot-general-problems.md
Michael Miele
committed
Merge branch 'mm-bot-test-network-connectivity' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-test-network-connectivity
Michael Miele
committed
Update bot-service-troubleshoot-general-problems.md
Michael Miele
committed
Merge branch 'master' into mm-bot-channel-fb
Emily Olshefski
authored
Apply suggestions from code review

Michael Miele
and
JonathanFingold
authored
Update bot-builder-lu-file-format.md
Emily Olshefski
authored
Merge branch 'master' into mm-bot-test-network-connectivity
JonathanFingold
authored
Merge pull request #2491 from MicrosoftDocs/mm-bot-test-network-connectivity
JonathanFingold
authored
Apply suggestions from code review

Michael Miele
and
Emily Olshefski
authored
Update quickstart-dotnet-prerequisites.md
Michael Miele
committed

Commits on Dec 22, 2020

Update snippet-deploy-without-bot.md
Michael Miele
committed
Fixed typos.
Michael Miele
committed
Update bot-service-channel-directline-extension.md
Michael Miele
committed
Update bot-service-channel-connect-facebook.md
Michael Miele
committed
Update bot-service-design-user-experience.md
Emily Olshefski
committed
Merge branch 'master' into mm-bot-channel-fb
JonathanFingold
authored
Merge pull request #2496 from MicrosoftDocs/mm-bot-channel-fb
JonathanFingold
authored
Update bot-builder-webchat-overview.md
Michael Miele
committed

Commits on Dec 23, 2020

Update bot-builder-webchat-overview.md
Michael Miele
committed
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Emily Olshefski
authored
Update bot-builder-webchat-overview.md
Michael Miele
committed
Moved v3 section to FAQ article
Michael Miele
committed
Update contributor-guide-index.md
JonathanFingold
committed
Merge branch 'master' into mm-bot-fix-issues
JonathanFingold
authored
Merge pull request #2499 from MicrosoftDocs/mm-bot-fix-issues
JonathanFingold
authored
Add GitHub tips and tricks article
JonathanFingold
committed
Added links in the index page and organized content
Michael Miele
committed
Update bot-service-resources-bot-framework-faq.md
Michael Miele
committed
Update bot-builder-webchat-overview.md
Michael Miele
committed
Merge branch 'master' into mm-bot-webchat-cleanup
Michael Miele
authored
Added links fixed wording
Michael Miele
committed
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-webchat-cleanup
Michael Miele
committed
Merge branch 'master' into jf/contrib-1223
JonathanFingold
authored
Update bot-builder-webchat-overview.md
Michael Miele
committed
Merge pull request #2502 from MicrosoftDocs/jf/contrib-1223
JonathanFingold
authored
Add messageBack to table, convert table to snippet
JonathanFingold
committed
Fixed content
Michael Miele
committed
Update snippet-card-action-types.md
JonathanFingold
committed
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Emily Olshefski
authored
Changed AKA links to relative path or site-relative link.s
WashingtonKayaker
committed
Merge pull request #2500 from MicrosoftDocs/v-emolsh/issue-fix/bot-docs-1969
JonathanFingold
authored
Merge branch 'master' into jf/messageBack
Emily Olshefski
authored
Merge branch 'live' into master
JonathanFingold
authored
Update what-is-new-archive.md
WashingtonKayaker
committed
Merge branch 'master' into SM-AKA-Link-Conversion
WashingtonKayaker
committed

Commits on Dec 24, 2020

Commits on Dec 27, 2020

Changed Adaptive Tool --> Adaptive Tools
Emily Olshefski
committed
changed tool --> tools in file name and related files
Emily Olshefski
committed
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Emily Olshefski
authored

Commits on Dec 28, 2020

Update bot-service-resources-faq-availability.md
Michael Miele
committed
Apply suggestions from code review

Michael Miele
and
JonathanFingold
authored
Update articles/file-format/bot-builder-lg-file-format.md

Emily Olshefski
and
JonathanFingold
authored
Update bot-service-resources-faq-availability.md
Michael Miele
committed
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-webchat-cleanup
Michael Miele
committed
Update articles/bot-service-resources-faq-availability.md

Michael Miele
and
JonathanFingold
authored
removed references to lg and lu
Emily Olshefski
committed
Update bot-service-resources-faq-availability.md
Michael Miele
committed
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/MicrosoftDocs/bot-docs-pr into mm-bot-webchat-cleanup
Michael Miele
committed
Update bot-service-resources-bot-framework-faq.md
Michael Miele
committed
Merge branch 'master' into mm-bot-webchat-cleanup
JonathanFingold
authored
Fix for bot-docs issue 1987
JonathanFingold
committed
Merge pull request #2501 from MicrosoftDocs/mm-bot-webchat-cleanup
JonathanFingold
authored
Update bot-framework-rest-connector-api-reference.md
JonathanFingold
committed
Fixed quotes
Michael Miele
committed
Fixed quotes
Michael Miele
committed
Update security-baseline.md
Michael Miele
committed
Update security-baseline.md
Michael Miele
committed

Commits on Dec 29, 2020

Commits on Dec 31, 2020

Update quickstart-python-prerequisites.md
Emily Olshefski
committed

Commits on Jan 4, 2021

Merge pull request #2514 from MicrosoftDocs/v-emolsh/issue-fix/bot-docs-1964
JonathanFingold
authored

Commits on Jan 5, 2021

mm-wht-here-links (#2515)

Michael Miele
and
JonathanFingold
authored

Commits on Jan 6, 2021

Issue 1982 fix - replace unowned AKA links (#2516)

Emily Olshefski
and
JonathanFingold
authored

Commits on Jan 7, 2021

Commits on Jan 11, 2021

Commits on Jan 12, 2021

Update bot-builder-howto-cross-train.md (#2473)

WashingtonKayaker
and
JonathanFingold
authored
mm-wht-doc-cleanup-01 (#2518)

Michael Miele
and
JonathanFingold
authored
Grammar pass on bot-builder-dotnet-sdk-quickstart (#2530)

WashingtonKayaker
and
JonathanFingold
authored
Merge branch 'master' of https://github.com/MicrosoftDocs/bot-docs-pr into smoke-test
v-alje
committed
Moving reference to new repo
v-alje
committed
Fixing invalid json
v-alje
committed
mm-bot-snippet-update (#2527)

Michael Miele
and
JonathanFingold
authored
mm-wht-writers-faqs (#2513)

authored
mm-wht-public-faqs (#2519)

Michael Miele
and
JonathanFingold
authored

Commits on Jan 13, 2021

Commits on Jan 14, 2021

Commits on Jan 15, 2021

Formatting text guide updates (#2546)

Emily Olshefski
and
JonathanFingold
authored
Incorporate fixes from bot-docs PRs. (#2543)
JonathanFingold
authored

Commits on Jan 19, 2021

Commits on Jan 22, 2021

Release 'live' 01-20-2021 (#2551)

authored

Commits on Jan 26, 2021

Initialize Docs repository: https://github.com/MicrosoftDocs/bot-docs-pr of branch live
v-alje
committed

Commits on Feb 12, 2021

Release 'live' 02-11-2021 (#2587)

authored