Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
402 commits
Select commit Hold shift + click to select a range
1eeef5e
Merge branch 'master' into issue-fixes-01292020
emgrol Jan 31, 2020
2d30139
Update bot-builder-basics.md
JonathanFingold Jan 31, 2020
79fcdf1
Update bot-builder-dialog-manage-complex-conversation-flow.md
JonathanFingold Jan 31, 2020
cc2117c
Update bot-builder-dialog-manage-complex-conversation-flow.md
JonathanFingold Jan 31, 2020
33a9a0e
Update bot-builder-compositcontrol.md
JonathanFingold Jan 31, 2020
70254a1
Update bot-builder-howto-add-media-attachments.md
JonathanFingold Feb 3, 2020
d6e41ce
Update bot-builder-webchat-overview.md
Feb 3, 2020
770c6a5
Reformatted PyPI, added Python to TOC
Feb 4, 2020
1431e0b
Update bot-framework-rest-direct-line-3-0-authentication.md
Feb 4, 2020
525a9b1
Update bot-framework-rest-direct-line-3-0-authentication.md
Feb 4, 2020
a54d377
Update bot-service-channel-directline-extension-net-bot.md
Feb 4, 2020
280cfc7
Merge pull request #1973 from MicrosoftDocs/02032020-pypi-fix
Kaiqb Feb 5, 2020
72df4fa
Merge branch 'live' into master
Kaiqb Feb 5, 2020
f3628f4
Merge pull request #1977 from MicrosoftDocs/master
Kaiqb Feb 5, 2020
d835bd6
Merge branch 'master' into issue-1484-fix
Kaiqb Feb 5, 2020
0bcfa44
Merge branch 'master' into jf/onDialog-0130
JonathanFingold Feb 5, 2020
1a5f6d4
Merge pull request #1958 from MicrosoftDocs/issue-1484-fix
Kaiqb Feb 5, 2020
8671303
Merge branch 'master' into jf/issues-0203
Kaiqb Feb 5, 2020
6bc5f99
Merge pull request #1971 from MicrosoftDocs/jf/issues-0203
Kaiqb Feb 5, 2020
663b09d
Merge branch 'master' into jf/onDialog-0130
Kaiqb Feb 5, 2020
b0e2c72
Merge branch 'master' into issue-fixes-01292020
Kaiqb Feb 5, 2020
1390024
Merge pull request #1969 from MicrosoftDocs/issue-fixes-01292020
Kaiqb Feb 6, 2020
691c244
Merge branch 'master' into mm-fixing-issue-1537
Kaiqb Feb 6, 2020
b3fdfce
Issue 1510 fix
Feb 6, 2020
ad17b70
Merge branch 'master' into jf/onDialog-0130
JonathanFingold Feb 6, 2020
0d4b704
C172129: Converting plain-text link to MD syntax
v-maudel Feb 6, 2020
84141ed
Merge pull request #1968 from MicrosoftDocs/jf/onDialog-0130
Kaiqb Feb 6, 2020
989472d
Merge branch 'master' into mm-fixing-issue-1537
Kaiqb Feb 6, 2020
fab5cf4
Merge pull request #1972 from MicrosoftDocs/mm-fixing-issue-1537
Kaiqb Feb 6, 2020
7361a63
Merge branch 'master' into mm-fixing-issue-1496
Kaiqb Feb 6, 2020
2665a83
Merge pull request #1974 from MicrosoftDocs/mm-fixing-issue-1496
Kaiqb Feb 6, 2020
6de959a
Merge branch 'master' into mm-fixing-issue-1547
Kaiqb Feb 6, 2020
c9143cd
C172132: Fixing indentation of code closing
v-maudel Feb 7, 2020
63a4c08
Merge pull request #1976 from MicrosoftDocs/mm-fixing-issue-1547
Kaiqb Feb 7, 2020
5445904
Merge branch 'master' into issue-1510-fix
Kaiqb Feb 7, 2020
9639762
Merge pull request #1978 from MicrosoftDocs/issue-1510-fix
Kaiqb Feb 7, 2020
3b5555b
Merge branch 'master' into patch-3
Kaiqb Feb 7, 2020
7110d13
Merge pull request #1979 from v-maudel/patch-3
Kaiqb Feb 7, 2020
f44d6af
Merge branch 'live' into master
Kaiqb Feb 7, 2020
d24fe21
Merge pull request #1981 from MicrosoftDocs/master
Kaiqb Feb 7, 2020
e17cac8
Update bot-builder-authentication.md
JonathanFingold Feb 7, 2020
8f5687f
Merge branch 'master' into jf/code-links-0207
JonathanFingold Feb 7, 2020
096f26f
Update Save user and conversation data
JonathanFingold Feb 7, 2020
39ba474
Update bot-builder-howto-v4-state.md
JonathanFingold Feb 7, 2020
c1a56a1
Merge branch 'master' into patch-4
Kaiqb Feb 7, 2020
cf0c059
Merge pull request #1980 from v-maudel/patch-4
Kaiqb Feb 7, 2020
5f384f6
Merge branch 'live' into master
Kaiqb Feb 7, 2020
2165840
Update snippet-create-app-registration.md
Feb 7, 2020
baa25ef
Update bot-builder-primitive-prompts.md
JonathanFingold Feb 7, 2020
829a0d3
Merge branch 'master' into jf/code-links-0207
JonathanFingold Feb 7, 2020
4a4fcc1
Update bot-builder-primitive-prompts.md
JonathanFingold Feb 7, 2020
edf4cd8
Update bot-builder-send-welcome-message.md
JonathanFingold Feb 7, 2020
81cacde
Corrected and improved content.
Feb 7, 2020
48c2b92
Update snippet-ARM-new-resource-group.md
Feb 7, 2020
5e71516
Update snippet-ARM-new-resource-group.md
Feb 7, 2020
629570f
Update snippet-ARM-new-resource-group.md
Feb 7, 2020
d687c45
Update snippet-ARM-new-resource-group.md
Feb 7, 2020
78d9fbc
Update bot-builder-send-welcome-message.md
JonathanFingold Feb 7, 2020
07f1a43
Update snippet-ARM-new-resource-group.md
Feb 7, 2020
37b937c
Replace ~/../botbuilder-python links with ~/../botbuilder-samples links
JonathanFingold Feb 7, 2020
ce417f9
Improved and corrected content.
Feb 8, 2020
cf4bc99
Update snippet-ARM-new-resource-group.md
Feb 8, 2020
9f8fe22
Merge pull request #1983 from MicrosoftDocs/master
Kaiqb Feb 10, 2020
b97b914
Merge branch 'master' into Fix-typos
Kaiqb Feb 10, 2020
629fe44
Added appendix
Feb 11, 2020
4f2fc16
Update snippet-deploy-simple-csharp-echo-bot.md
Feb 11, 2020
baa6097
Heading fixes
Feb 11, 2020
974e13d
Update snippet-deploy-simple-csharp-echo-bot.md
Feb 11, 2020
90493e9
Update bot-builder-deploy-az-cli.md
Feb 11, 2020
546c89c
Update bot-builder-deploy-az-cli.md
Feb 11, 2020
1d76642
Syntax fixes
Feb 11, 2020
f1e794d
Delete note added bot ready info
Feb 12, 2020
64509ff
Update snippet-prepare-deploy-intro.md
Feb 12, 2020
749eff5
Delete snippet-deploy-simple-csharp-echo-bot.md
Feb 12, 2020
88dd1b5
Merge pull request #1931 from MicrosoftDocs/Fix-typos
Kaiqb Feb 12, 2020
da4f2fc
Merge branch 'master' into jf/code-links-0207
Kaiqb Feb 12, 2020
c2f5478
Merge pull request #1982 from MicrosoftDocs/jf/code-links-0207
Kaiqb Feb 12, 2020
b856fa9
Merge branch 'live' into master
Kaiqb Feb 12, 2020
e5bf9a7
Merge pull request #1986 from MicrosoftDocs/master
Kaiqb Feb 12, 2020
50be1f5
Fixed content based on review feedback
Feb 12, 2020
61857f9
Merge branch 'master' into mm-fixing-issue-1546
Feb 12, 2020
1e217c6
Fixed warnings
Feb 12, 2020
c0e5ead
Merge branch 'mm-fixing-issue-1546' of https://github.com/MicrosoftDo…
Feb 12, 2020
d56aeb1
Update snippet-zip-code.md
Feb 12, 2020
29e0ba8
Made more fixed based on feedback
Feb 12, 2020
69d95ae
More feedback fixes
Feb 13, 2020
5a1324d
Update bot-builder-deploy-az-cli.md
Feb 13, 2020
e2c1d10
Update bot-builder-deploy-az-cli.md
Feb 14, 2020
dcfdc5c
Update bot-service-channel-connect-directline.md
Feb 14, 2020
273fe22
Updated aka links
Feb 14, 2020
be8b034
Addressed issue 1556 (typo)
Feb 14, 2020
9c9ec33
Merge pull request #1984 from MicrosoftDocs/mm-fixing-issue-1546
Kaiqb Feb 18, 2020
48f14b5
Merge branch 'master' into mm-fixing-issue-1499
Kaiqb Feb 18, 2020
77658ed
Merge pull request #1988 from MicrosoftDocs/mm-fixing-issue-1499
Kaiqb Feb 18, 2020
46ca166
Merge branch 'master' into minor-fixes-21420
Kaiqb Feb 18, 2020
9000c22
Merge pull request #1989 from MicrosoftDocs/minor-fixes-21420
Kaiqb Feb 18, 2020
dd23a16
Merge branch 'live' into master
Kaiqb Feb 18, 2020
4ddee4f
Merge pull request #1990 from MicrosoftDocs/master
Kaiqb Feb 18, 2020
925107a
Update skill-implement-consumer.md
JonathanFingold Feb 18, 2020
c69cd01
Update skill-implement-consumer.md
JonathanFingold Feb 18, 2020
9126e71
Update bot-service-resources-bot-framework-faq.md
Kaiqb Feb 19, 2020
9198eeb
Create stubs for the v3 bots as skills articles
JonathanFingold Feb 19, 2020
7dc2d54
Merge pull request #1993 from MicrosoftDocs/kaiqbfix
Kaiqb Feb 19, 2020
8555217
Merge branch 'live' into master
Kaiqb Feb 19, 2020
41f1197
Merge pull request #1994 from MicrosoftDocs/master
Kaiqb Feb 19, 2020
f5f6a4d
Merging changes synced from https://github.com/MicrosoftDocs/bot-fram…
openpublishbuild Feb 19, 2020
91aaa65
Merge pull request #1996 from MicrosoftDocs/community-content63717737…
Kaiqb Feb 19, 2020
db9965c
Merging changes synced from https://github.com/MicrosoftDocs/bot-fram…
openpublishbuild Feb 19, 2020
0ba99ff
Merge branch 'community-content' into community-content-live-sync-work
Kaiqb Feb 19, 2020
b69ed68
Merge pull request #1997 from MicrosoftDocs/community-content-live-sy…
Kaiqb Feb 19, 2020
6300053
Merge branch 'community-content' into community-content63717740771886…
Kaiqb Feb 19, 2020
64e084a
Merge pull request #1998 from MicrosoftDocs/community-content63717740…
Kaiqb Feb 19, 2020
ba75525
Merge branch 'master' into community-content
Kaiqb Feb 19, 2020
74f0517
Merge pull request #1999 from MicrosoftDocs/community-content
Kaiqb Feb 19, 2020
e0860d2
Merge branch 'master' into jf/code-links-0218
Kaiqb Feb 19, 2020
0869b32
Merge pull request #1991 from MicrosoftDocs/jf/code-links-0218
Kaiqb Feb 19, 2020
a7b51e3
Merge branch 'live' into master
Kaiqb Feb 19, 2020
62b51d0
Merge pull request #2000 from MicrosoftDocs/master
Kaiqb Feb 19, 2020
aebcc45
Merging changes synced from https://github.com/MicrosoftDocs/bot-fram…
openpublishbuild Feb 19, 2020
4c3a78f
Merge pull request #2001 from MicrosoftDocs/community-content63717745…
Kaiqb Feb 19, 2020
e176a2e
Merge branch 'master' into community-content
Kaiqb Feb 19, 2020
ab8b662
Merge pull request #2002 from MicrosoftDocs/community-content
Kaiqb Feb 19, 2020
13f1006
Fixing issue 1559
Feb 20, 2020
93c6641
Update bot-service-channel-connect-directlinespeech.md
Feb 20, 2020
e70ed97
WIP
JonathanFingold Feb 20, 2020
fe0a2a9
Update bot-framework-rest-direct-line-1-1-concepts.md
Kaiqb Feb 20, 2020
96f9f16
Update bot-framework-rest-connector-add-input-hints.md
Kaiqb Feb 20, 2020
6b66611
Update bot-framework-rest-connector-text-to-speech.md
Kaiqb Feb 20, 2020
e8e9616
Update bot-framework-rest-direct-line-3-0-concepts.md
Kaiqb Feb 20, 2020
3c51802
Update bot-framework-rest-state.md
Kaiqb Feb 20, 2020
071ae1b
Update bot-framework-rest-direct-line-3-0-reconnect-to-conversation.md
Kaiqb Feb 20, 2020
1ed2b41
Update bot-framework-rest-direct-line-3-0-start-conversation.md
Kaiqb Feb 20, 2020
7e501fc
Update bot-framework-rest-direct-line-3-0-end-conversation.md
Kaiqb Feb 20, 2020
5185a9a
Update bot-service-resources-user-agent.md
Kaiqb Feb 20, 2020
087280a
Update bot-framework-rest-connector-concepts.md
Kaiqb Feb 20, 2020
aebe829
Update bot-builder-python-quickstart.md
Feb 20, 2020
8ddc529
Update bot-service-troubleshoot-bot-configuration.md
Kaiqb Feb 20, 2020
2fd583d
Update bot-framework-rest-overview.md
Kaiqb Feb 20, 2020
afd9d50
Update bot-framework-rest-connector-text-to-speech.md
Kaiqb Feb 20, 2020
92b3e8d
Update bot-framework-rest-overview.md
Kaiqb Feb 20, 2020
8cfd056
Update bot-service-resources-bot-framework-faq.md
Kaiqb Feb 20, 2020
0b9ca76
Merge pull request #2007 from MicrosoftDocs/kaiqb/rest
Kaiqb Feb 20, 2020
7aa9012
Merge branch 'live' into master
Kaiqb Feb 20, 2020
308e6df
Merge pull request #2008 from MicrosoftDocs/master
Kaiqb Feb 20, 2020
87cc2e0
Update bot-service-troubleshoot-general-problems.md
Kaiqb Feb 20, 2020
d57ae4c
Merge pull request #2009 from MicrosoftDocs/kaiqb/rest-fix
Kaiqb Feb 20, 2020
1b0c0d1
Update bot-service-resources-bot-framework-faq.md
Kaiqb Feb 20, 2020
167f14c
Merge branch 'master' into kaiqb/rest-fix
Kaiqb Feb 20, 2020
ac1f5c6
Update bot-service-resources-bot-framework-faq.md
Kaiqb Feb 20, 2020
d4f206a
Merge pull request #2010 from MicrosoftDocs/kaiqb/rest-fix
Kaiqb Feb 20, 2020
000e025
Merge branch 'live' into master
Kaiqb Feb 20, 2020
54d3feb
Merge pull request #2011 from MicrosoftDocs/master
Kaiqb Feb 20, 2020
253c3c8
Merge branch 'master' into issue-1565-fix
emgrol Feb 21, 2020
f225e91
WIP - finish echo bot section
JonathanFingold Feb 24, 2020
0b64fa7
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Feb 24, 2020
c10bc3a
WIP add pizza bot instructions
JonathanFingold Feb 24, 2020
2542bac
WIP: sandwich bot
JonathanFingold Feb 24, 2020
e5e99e3
WIP: root bot
JonathanFingold Feb 24, 2020
d5de792
Finish draft of v3 C# bot as skill
JonathanFingold Feb 25, 2020
05157b8
Merge pull request #2006 from MicrosoftDocs/issue-1565-fix
Kaiqb Feb 25, 2020
bda3820
Merge branch 'master' into mm-fixing-issue-1559
Kaiqb Feb 25, 2020
91e03e9
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Feb 25, 2020
8a2175b
partial update based on feedback
JonathanFingold Feb 25, 2020
7bcab42
Fix various issues
JonathanFingold Feb 25, 2020
d98c024
Finish updating C# article based on updated sample
JonathanFingold Feb 26, 2020
a8d0a4b
C172135: Adding hard break
V-vafune Feb 27, 2020
bfd905a
C180774: Adding Hard Break
V-vafune Feb 27, 2020
5299742
Update per Eric's review
JonathanFingold Feb 27, 2020
10ff890
Clump .NET and JS articles separately
JonathanFingold Feb 27, 2020
4b565f4
Add stubs for new sections.
JonathanFingold Feb 27, 2020
8f0da7b
Capture a request from Andrew
JonathanFingold Feb 27, 2020
c8481fe
Fixing issue 1554
Feb 28, 2020
6198ff1
Update bot-service-channel-connect-slack.md
Feb 28, 2020
9228b1f
creating an overview article and structure changes
andrewclear-ms Feb 28, 2020
ed334fc
C180775: Adding Hard Break
V-vafune Feb 28, 2020
40f1bce
Merge pull request #2021 from MicrosoftDocs/anclear/v3-skills
JonathanFingold Feb 28, 2020
e0078bb
Start on JS v3 conversion article
JonathanFingold Feb 28, 2020
cdb9030
Updated image and done some formatting
Feb 28, 2020
d2e19ba
Update bot-service-channel-connect-slack.md
Feb 28, 2020
be0f6e7
Update bot-service-channel-connect-slack.md
Feb 28, 2020
aa4e2f6
Update bot-service-channel-connect-slack.md
Feb 28, 2020
abd8924
Add JS echo skill
JonathanFingold Feb 29, 2020
ea815cf
Update javascript-v3-as-skill.md
JonathanFingold Mar 2, 2020
2ea22c1
WIP
JonathanFingold Mar 2, 2020
5ab8ad6
Finish first draft of v3 JS bot as skill article.
JonathanFingold Mar 2, 2020
28c696e
Update TOC.md
JonathanFingold Mar 2, 2020
3c8e321
final copy edit before review
JonathanFingold Mar 2, 2020
7b6d208
Issue 1580 fix
Mar 3, 2020
343b2fa
Update bot-builder-python-quickstart.md
emgrol Mar 3, 2020
771f571
C180766: Fixing Missing Hard Break
V-vafune Mar 3, 2020
9e248e9
C180771: Fixing Missing Hard Breaks
V-vafune Mar 3, 2020
d9aa7fe
C180773: Fixing Missing Hard Breaks
V-vafune Mar 3, 2020
b5196f8
Update javascript-v3-as-skill.md
JonathanFingold Mar 3, 2020
81b5bc1
Update re samples PR [2223](https://github.com/microsoft/BotBuilder-S…
JonathanFingold Mar 3, 2020
3d418a4
Link to the convert a v3 bot overview from the general migration over…
JonathanFingold Mar 3, 2020
9cb7a2f
Update skills-conceptual.md
JonathanFingold Mar 3, 2020
537d73e
C180776: Converting plain-text link to MD syntax
v-maudel Mar 4, 2020
4e8ae08
Add <!--note--> and tweak formatting.
JonathanFingold Mar 4, 2020
411a85d
Merge pull request #2027 from V-vafune/patch-7
Kaiqb Mar 4, 2020
7eccdea
Merge branch 'master' into patch-6
Kaiqb Mar 4, 2020
f1fe813
Merge pull request #2026 from V-vafune/patch-6
Kaiqb Mar 4, 2020
de8d1ab
Merge branch 'master' into patch-4
Kaiqb Mar 4, 2020
d4266ea
Merge branch 'master' into patch-3
v-maudel Mar 4, 2020
3228258
Merge pull request #2024 from V-vafune/patch-4
Kaiqb Mar 4, 2020
6e0bd2f
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
60cbda3
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
54cefe8
Merge pull request #2022 from V-vafune/patch-3
Kaiqb Mar 4, 2020
bfa867c
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
564e6e3
Merge pull request #2028 from v-maudel/patch-3
Kaiqb Mar 4, 2020
eb5ddf4
Merge branch 'master' into patch-2
Kaiqb Mar 4, 2020
9fa0321
Merge pull request #2017 from V-vafune/patch-2
Kaiqb Mar 4, 2020
038b0bf
Merge branch 'master' into patch-1
Kaiqb Mar 4, 2020
5170bcd
Merge pull request #2016 from V-vafune/patch-1
Kaiqb Mar 4, 2020
84b3192
Merge branch 'live' into master
Kaiqb Mar 4, 2020
2109d9d
Merge pull request #2030 from MicrosoftDocs/master
Kaiqb Mar 4, 2020
11ecff2
Merge branch 'master' into issue-1580-fix
Kaiqb Mar 4, 2020
5707929
Merge pull request #2023 from MicrosoftDocs/issue-1580-fix
Kaiqb Mar 4, 2020
5bab996
Merge branch 'master' into mm-fixing-issue-1554
Kaiqb Mar 4, 2020
a61770d
Merge pull request #2020 from MicrosoftDocs/mm-fixing-issue-1554
Kaiqb Mar 4, 2020
7c11528
Merge branch 'master' into jf/issues-0225
Kaiqb Mar 4, 2020
4d151be
Merge pull request #2013 from MicrosoftDocs/jf/issues-0225
Kaiqb Mar 4, 2020
07b7a46
Update quickstart-javascript.md
JonathanFingold Mar 4, 2020
9fbb20d
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 4, 2020
b83d80e
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 4, 2020
595b1cf
Merge branch 'master' into mm-fixing-issue-1559
Kaiqb Mar 4, 2020
bc9f60e
Merge pull request #2005 from MicrosoftDocs/mm-fixing-issue-1559
Kaiqb Mar 4, 2020
64dfd9a
Merge branch 'master' into jf/misc-0304
Kaiqb Mar 4, 2020
0a67232
Merge pull request #2031 from MicrosoftDocs/jf/misc-0304
Kaiqb Mar 4, 2020
b1a8643
C172027: Fixing Missing Hard Breaks
v-maudel Mar 6, 2020
7a21798
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 12, 2020
7811a2c
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 12, 2020
5758dc0
Merge pull request #2033 from v-maudel/patch-3
Kaiqb Mar 12, 2020
be45f70
Incorporate tech review feedback.
JonathanFingold Mar 12, 2020
a0a900e
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 12, 2020
a0925fb
C180766: Adding two spaces to create hard break-line before snippet|i…
v-maudel Mar 13, 2020
c131a54
Typo fixes (issues 1596 and 1601)
Mar 16, 2020
bd092c4
Update bot-builder-howto-v4-storage.md
emgrol Mar 16, 2020
2ad8e3d
Fix code links (sample was updated).
JonathanFingold Mar 17, 2020
a15c9ef
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 17, 2020
36bdd13
Merge pull request #2036 from v-maudel/patch-3
Kaiqb Mar 17, 2020
9819769
Merge branch 'master' into 031620-typo-fixes
Kaiqb Mar 17, 2020
adee29d
Merge pull request #2040 from MicrosoftDocs/031620-typo-fixes
Kaiqb Mar 17, 2020
86ce922
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 18, 2020
70b788a
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 18, 2020
f06d141
Merge pull request #1992 from MicrosoftDocs/jf/R8-v3-skills
Kaiqb Mar 18, 2020
ec2c88e
Merge branch 'master' into jf/R8-SkillsDialog
Kaiqb Mar 18, 2020
ad6e944
Merge pull request #2019 from MicrosoftDocs/jf/R8-SkillsDialog
Kaiqb Mar 18, 2020
e488d76
Merge branch 'live' into master
Kaiqb Mar 18, 2020
a1a0e15
Merge pull request #2044 from MicrosoftDocs/master
Kaiqb Mar 18, 2020
f63f2a3
Merging changes synced from https://github.com/MicrosoftDocs/bot-docs…
openpublishbuild Mar 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions articles/bot-service-channel-connect-directlinespeech.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ms.author: travisw

You can configure your bot to allow client applications to communicate with it through the Direct Line Speech channel.

Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech/sdk). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/bots/speech/va) page.
Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech/sdk). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/bots/speech/va) page.

## Add the Direct Line Speech channel

Expand All @@ -29,9 +29,20 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable

![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-connectspeechchannel.png "connecting Direct Line Speech")

1. Direct Line Speech Channel requires a Cognitive Services resource. You can either use an existing resource or create a new Cognitive Services resource following the [instructions](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account).
1. Configure the Direct Line Speech as shown in the picture below.

![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cogntive Services resource")
![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cognitive Services resource")

The Direct Line Speech Channel requires a Cognitive Services resource, specifically a **speech** cognitive service resource. You can either use an existing resource or create a new one. To create a new speech resource follow these steps:

- Go to the [Azure portal create resources](https://ms.portal.azure.com/#create/hub).
- Search for *Speech* and select it from the drop-down list. The following is displayed:

![create speech cognitive resource](media/voice-first-virtual-assistants/create-speech-cognitive-resource.PNG "Create speech cognitive resource")

- Follow the wizard steps.

For additional information, see [Create a Cognitive Services resource](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account).

1. Once you've reviewed the terms of use, click `Save` to confirm your channel selection.

Expand All @@ -41,7 +52,7 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable

With the Direct Line Speech channel connected to your bot, you now need to enable Bot Framework Protocol Streaming Extensions support for optimal, low-latency interaction.

1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com).
1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com).

1. Click on **Settings** under the **Bot Management** category (right below **Channels**). Click the checkbox for **Enable Streaming Endpoint**.

Expand Down
66 changes: 39 additions & 27 deletions articles/bot-service-channel-connect-slack.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,53 @@ There are two ways in which you can confgure Slack messaging app:
## [Azure Bot Service Portal](#tab/abs)
## Create a Slack application for your bot

Log into [Slack](https://slack.com/signin) and then go to [create a Slack application](https://api.slack.com/apps) channel.
1. In your browser, log into [Slack](https://slack.com/signin).
1. Navigate to [create a Slack application](https://api.slack.com/apps) channel.

![Set up bot](~/media/channels/slack-NewApp.png)

## Create an app and assign a Development Slack team

Enter an App Name and select a Development Slack Team. If you are not already a member of a Development Slack Team, [create or join one](https://slack.com/).
1. Click the **Create New App** button.
1. Enter an App Name and select a Development Slack Team.
If you are not already a member of a Development Slack Team, [create or join one](https://slack.com/).

![Create app](~/media/channels/slack-CreateApp.png)

Click **Create App**. Slack will create your app and generate a Client ID and Client Secret.
1. Click the **Create App** button. Slack will create your app and generate a **Client ID** and **Client Secret**.

## Add a new Redirect URL

Next you will add a new Redirect URL.

1. Select the **OAuth & Permissions** tab.
2. Click **Add a new Redirect URL**.
3. Enter [https://slack.botframework.com](https://slack.botframework.com).
4. Click **Add**.
5. Click **Save URLs**.
1. In the left panel, click the **OAuth & Permissions** link.
2. In the right panel, click the **Add a new Redirect URL** button.
3. Enter the following value `https://slack.botframework.com`.
4. Click the **Add** button.
5. Click the **Save URLs** button.

![Add Redirect URL](~/media/channels/slack-RedirectURL.png)

## Create a Slack Bot User
## Add bot token scopes
<!-- Replaces add user -->
1. In the left panel, click the **OAuth & Permissions** link.
1. In the right panel, scroll down to **Scopes**.
1. In the **Bot Token Scopes** section, click the **Add an OAuth Scope** button.
1. Make sure to select the following scopes, also shown in the picture:

Adding a Bot User allows you to assign a username for your bot and choose whether it is always shown as online.
- `app_mentions:read`
- `channels:history`
- `channels:read`
- `chat:write`
- `groups:history`
- `groups:read`
- `im:history`
- `mpim:history`

1. Select the **Bot Users** tab.
2. Click **Add a Bot User**.
![slack bot scopes](media/channels/slack-bot-scopes.PNG)

![Create bot](~/media/channels/slack-CreateBot.png)
1. In the left panel select the **App Home** link.
1. In the right panel, scroll down and enable **Always Show My Bot as Online**.

Click **Add Bot User** to validate your settings, click **Always Show My Bot as Online** to **On**, and then click **Save Changes**.

![Create bot](~/media/channels/slack-CreateApp-AddBotUser.png)
![slack bot display](media/channels/slack-bot-display.PNG)

## Subscribe to Bot Events

Expand All @@ -73,12 +84,13 @@ Follow these steps to subscribe to six particular bot events. By subscribing to

4. In **Subscribe to Bot Events**, click **Add Bot User Event**.
5. In the list of events, select these six event types:
* `member_joined_channel`
* `member_left_channel`
* `message.channels`
* `message.groups`
* `message.im`
* `message.mpim`

- `member_joined_channel`
- `member_left_channel`
- `message.channels`
- `message.groups`
- `message.im`
- `message.mpim`

![Subscribe Events: middle](~/media/channels/slack-SubscribeEvents-b.png)

Expand Down Expand Up @@ -281,10 +293,10 @@ Now that you have created a Slack app and wired up the adapter in your bot proje
To complete this step, [deploy your bot to Azure](https://aka.ms/bot-builder-deploy-az-cli) and make a note of the URL to your deployed bot.

> [!NOTE]
> If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Slack adapter, you can use a tool such as [ngrok](https://www.ngrok.com) (which you will likely already have installed if you have used the Bot Framework emulator previously) to tunnel through to your bot running locally and provide you with a publicly accessible URL for this.
>
> If you are not ready to deploy your bot to Azure, or wish to debug your bot when using the Slack adapter, you can use a tool such as [ngrok](https://www.ngrok.com) (which you will likely already have installed if you have used the Bot Framework emulator previously) to tunnel through to your bot running locally and provide you with a publicly accessible URL for this.
>
> If you wish create an ngrok tunnel and obtain a URL to your bot, use the following command in a terminal window (this assumes your local bot is running on port 3978, alter the port numbers in the command if your bot is not).
>
>
> ```
> ngrok.exe http 3978 -host-header="localhost:3978"
> ```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ https://github.com/Jeffders/DirectLineAppServiceExtensionPreview/tree/master/lib

## Integrate WebChat client

Generally speaking, the approach is the same as before. With the exception that a new version of **WebChat** has been created that supports two-way **WebSocket** traffic, which instead of connecting to https://directline.botframework.com/ connects directly to your hosted bot.
Generally speaking, the approach is the same as before. With the exception that a new version of **WebChat** has been created that supports two-way **WebSocket** traffic, which instead of connecting to [https://directline.botframework.com/](https://directline.botframework.com/) connects directly to your hosted bot.
The direct line URL for your bot will be `https://<your_app_service>.azurewebsites.net/.bot/`, where the `/.bot/` extension is the Direct Line **endpoint** on your App Service.
If you can configure your own domain name you still must append the `/.bot/` path to access the direct line REST APIs.

Expand Down
Loading