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

Merged

Kaiqb merged 597 commits intolivefrom

Nov 27, 2019

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

Commits on Aug 2, 2019

Commits on Aug 6, 2019

Update articles/bot-builder-deploy-az-cli.md

Kaiqb
and
emgrol
authored
Update articles/bot-builder-deploy-az-cli.md

Kaiqb
and
emgrol
authored
Update bot-builder-deploy-az-cli.md
Kaiqb
authored
Update bot-builder-tutorial-basic-deploy.md
Emily Olshefski
committed
Update bot-builder-deploy-az-cli.md
Emily Olshefski
committed
Update bot-builder-tutorial-basic-deploy.md
Emily Olshefski
committed

Commits on Aug 7, 2019

Update bot-builder-deploy-az-cli.md
Emily Olshefski
committed
Update bot-builder-tutorial-basic-deploy.md
Emily Olshefski
committed
Update bot-builder-deploy-az-cli.md
Emily Olshefski
committed
Update bot-builder-tutorial-basic-deploy.md
Emily Olshefski
committed
Update bot-builder-tutorial-basic-deploy.md
Emily Olshefski
committed
Update bot-builder-deploy-az-cli.md
Emily Olshefski
committed
Update bot-builder-deploy-az-cli.md
Kaiqb
authored
Update bot-builder-deploy-az-cli.md
Kaiqb
authored
Update bot-builder-deploy-az-cli.md
Kaiqb
authored
Community content (#1634)
Kaiqb
authored
Merge branch 'live' into master
Kaiqb
authored
Release 'live' 08-07-2019 (#1646)
Kaiqb
authored

Commits on Aug 8, 2019

M37355: Fixing typo awo/two (#1643)

v-maudel
authored and
emgrol
committed
mm/directline-update (#1644)

Michael Miele
authored and
emgrol
committed
Various doc edits (#1637)

JonathanFingold
authored and
emgrol
committed
yl-fix broken links (#1641)

zxyanliu
authored and
emgrol
committed
mm/fixing issues (#1638)

Michael Miele
authored and
emgrol
committed
Update bot-builder-nodejs-cortana-skill.md (#1649)
emgrol
authored
Merge branch 'live' into master
emgrol
authored
Update cortana-skill-concepts.md
emgrol
authored
Release 'live' 08-07-2019 (part 2) (#1650)
emgrol
authored

Commits on Aug 9, 2019

[VA & Skills] Updated links in VA and Skill documentation (#1642)

lauren-mills
authored and
emgrol
committed

Commits on Aug 12, 2019

Put my working notes somewhere where other writers can access them. (#1651)
JonathanFingold
authored

Commits on Aug 14, 2019

[styleguide: dialogs] Incremental updates (#1657)
JonathanFingold
authored

Commits on Aug 15, 2019

Commits on Aug 17, 2019

Commits on Aug 20, 2019

Commits on Aug 21, 2019

mm/fixing issues (#1647)

Michael Miele
authored and
emgrol
committed
Merge branch 'live' into master
emgrol
authored
Release 'live' 08-21-2019 part 1 (#1675)
emgrol
authored
fix bugs in JS code (#1674)

zxyanliu
authored and
emgrol
committed

Commits on Aug 22, 2019

Commits on Aug 23, 2019

Commits on Aug 26, 2019

mm/migration-issues (#1656)

Michael Miele
authored and
emgrol
committed
Release 'live' 08-26-2019 (#1681)
emgrol
authored
mm/migration (removed JavaScript user state topic) (#1683)

Michael Miele
authored and
emgrol
committed
yl-fixing-code-order (#1682)

zxyanliu
authored and
emgrol
committed
mm/auth-issues (#1680)

Michael Miele
authored and
emgrol
committed
yl-deploy-suggested-changes01 (#1659)

zxyanliu
authored and
emgrol
committed
Restore old REST API object documentation and cross-linking. (#1684)

JonathanFingold
authored and
emgrol
committed
C113896: Adding break-line before snippet (#1669)

v-maudel
authored and
emgrol
committed
Merge branch 'live' into master
emgrol
authored
Release 'live' 09-26-2019 part 2 (#1686)
emgrol
authored

Commits on Aug 27, 2019

Fixing auth issues (#1685)

Michael Miele
authored and
emgrol
committed

Commits on Aug 28, 2019

Commits on Aug 29, 2019

CC152236: fixing typo for consistency CSharp/C# (#1696)

v-maudel
authored and
emgrol
committed
CC152231: fixing typo for consistency CSharp/C# (#1695)

v-maudel
authored and
emgrol
committed
CC152112: fixing typo for consistency CSharp/C# (#1694)

v-maudel
authored and
emgrol
committed
CC152110: fixing typo for consistency CSharp/C# (#1693)

v-maudel
authored and
emgrol
committed
CC152099: fixing typo for consistency CSharp/C# (#1692)

v-maudel
authored and
emgrol
committed
CC152097: fixing typo for consistency CSharp/C# (#1691)

v-maudel
authored and
emgrol
committed
CC152078: fixing typo for consistency CSharp/C# (#1690)

v-maudel
authored and
emgrol
committed
Minor edits and updates to dialog terms (#1699)
JonathanFingold
authored
Fix schema docs (#1698)

Kyle Delaney
authored and
emgrol
committed

Commits on Aug 30, 2019

Commits on Sep 3, 2019

Merge branch 'live' into master
emgrol
authored
Update what-is-new.md with AKA link fix (#1701)
emgrol
authored
mm/fixing issues (#1697)

Michael Miele
authored and
emgrol
committed
Release 'live' 09-03-2019 (#1705)
emgrol
authored

Commits on Sep 5, 2019

Commits on Sep 6, 2019

Update bot-service-activities-entities.md (#1716)

zxyanliu
authored and
emgrol
committed

Commits on Sep 9, 2019

Merge branch 'live' into master
emgrol
authored
Release 'live' 09-09-2019 (#1718)
emgrol
authored
Add ref doc process notes (#1717)
JonathanFingold
authored
Update bot-framework-rest-connector-api-reference.md (#1712)

Michael Miele
authored and
emgrol
committed

Commits on Sep 18, 2019

Commits on Sep 20, 2019

Add notes on writing JS ref docs (#1732)
JonathanFingold
authored

Commits on Sep 23, 2019

Public issue 1356 (#1735)

diberry
authored and
emgrol
committed

Commits on Sep 25, 2019

Removed mentions of Channel Inspector - issue 1345 (#1742)
emgrol
authored
mm-tracking issues (#1688)

Michael Miele
authored and
emgrol
committed
mm-fixing-speech-issues (#1734)

Michael Miele
authored and
emgrol
committed
Adding link to 'Next Steps' section - issue 1354 (#1738)
emgrol
authored
Adding TypeScript bot detail in deployment snippets (#1736)

zxyanliu
authored and
emgrol
committed
Fixed activity class link (#1737)
emgrol
authored
Merge branch 'live' into master
emgrol
authored
Release 'live' 09-25-2019 (#1744)
emgrol
authored
Add to notes on adaptive dialogs (#1745)
JonathanFingold
authored

Commits on Sep 30, 2019

Commits on Oct 1, 2019

Commits on Oct 2, 2019

C123185: Fixing hiperlink syntax (#1757)

v-maudel
authored and
emgrol
committed

Commits on Oct 7, 2019

Update notes (#1759)
JonathanFingold
authored

Commits on Oct 8, 2019

Update bot-service-channel-directline-extension.md (#1758)

Michael Miele
authored and
Kaiqb
committed
Merge branch 'live' into master
JonathanFingold
authored
Release 'live' 10-08-2019 (#1760)
Kaiqb
authored

Commits on Oct 9, 2019

Commits on Oct 14, 2019

Commits on Oct 16, 2019

Update dialog notes for writers (#1773)
JonathanFingold
authored

Commits on Oct 17, 2019

Commits on Oct 18, 2019

Tweak dialogs diagram (#1779)

JonathanFingold
authored and
emgrol
committed

Commits on Oct 28, 2019

Commits on Nov 2, 2019

Release 'live' 11-01-2019 (#1791)
Kaiqb
authored

Commits on Nov 4, 2019

Commits on Nov 6, 2019

Fix selected code-links (11/05) (#1798)

JonathanFingold
authored and
emgrol
committed
Update bot-service-debug-inspection-middleware.md (#1800)

zxyanliu
authored and
emgrol
committed
Update javascript-migration-quickreference.md (#1786)

Michael Miele
authored and
emgrol
committed
mm-azure-work-item-30108-auth (#1748)

Michael Miele
authored and
emgrol
committed
mm-fixing-directline-issue-1335 (#1799)

Michael Miele
authored and
emgrol
committed
Fix code snippets in the following articles: (#1793)

JonathanFingold
authored and
emgrol
committed
mm-work-item-30646-faq (#1743)

Michael Miele
authored and
emgrol
committed

Commits on Nov 7, 2019

Issue 1383 fix (#1797)
emgrol
authored
Update dialog-diagrams.pptx (#1807)
JonathanFingold
authored
Fix selected code links (11/06) (#1804)

JonathanFingold
authored and
emgrol
committed
Update bot-builder-telemetry.md (#1805)

WashingtonKayaker
authored and
emgrol
committed
Update bot-builder-authentication.md (#1809)

Michael Miele
authored and
emgrol
committed

Commits on Nov 8, 2019

Commits on Nov 13, 2019

M44898: Fixing typo give/given (#1812)

v-maudel
authored and
emgrol
committed
mm-fixing-issue-1379 (#1808)

Michael Miele
authored and
emgrol
committed

Commits on Nov 15, 2019

yl-fixes-issue (#1820)

zxyanliu
authored and
emgrol
committed
Addressing Issue #1421 (#1826)

WashingtonKayaker
authored and
emgrol
committed

Commits on Nov 18, 2019

Update bot-service-review-guidelines.md (#1828)

zxyanliu
authored and
emgrol
committed
Clarify that it's the bot's app ID and password, not the user's (#1829)

JonathanFingold
authored and
emgrol
committed

Commits on Nov 20, 2019

Commits on Nov 22, 2019

Commits on Nov 26, 2019

Commits on Nov 27, 2019