Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4361 commits
Select commit Hold shift + click to select a range
02f98c4
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 24, 2020
d6a8621
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 24, 2020
95110a2
Create bot-service-debug-adaptive-tool.md
Nov 25, 2020
affb1dc
Added links to debug with adaptive tool article
Nov 25, 2020
dce5ad1
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Nov 25, 2020
fc4caf6
Update bot-service-debug-adaptive-tool.md
Nov 25, 2020
92aba15
Update bot-service-debug-adaptive-tool.md
Nov 25, 2020
2d11e03
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 25, 2020
3988e31
Fix typo
JonathanFingold Nov 30, 2020
9243ab7
Fixed content.
Nov 30, 2020
6d68a57
Update bot-service-channel-directline-extension-net-bot.md
Nov 30, 2020
f175cdd
Incoroporate John's feedback
JonathanFingold Dec 1, 2020
01cb348
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
ecae3e7
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
ff44324
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
429eab8
Update TOC.yml
Dec 1, 2020
0dd6b82
Update adaptive-expressions-prebuilt-functions.md
Dec 1, 2020
ce56814
Update adaptive-expressions-prebuilt-functions.md
Dec 1, 2020
53dac95
Address John's feedback
JonathanFingold Dec 1, 2020
f0d0399
Merge pull request #2481 from MicrosoftDocs/jf/proactive-1124
JonathanFingold Dec 1, 2020
6539c51
Merge branch 'master' into mm-bot-issue-1958
JonathanFingold Dec 1, 2020
7d9e41b
Merge pull request #2483 from MicrosoftDocs/mm-bot-issue-1958
JonathanFingold Dec 1, 2020
450249a
Added image and fixed content to explain trusted origins based on a d…
Dec 2, 2020
2d3b6e8
Chnaged new articel title and fixed related links.
Dec 2, 2020
ee65032
Fixed based on CK feedback
Dec 2, 2020
88505de
Update C# quickstart post R11
JonathanFingold Dec 2, 2020
0ae142d
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold Dec 2, 2020
8ac390b
Update bot-service-resources-faq-security.md
Dec 2, 2020
e9a443e
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/Microso…
Dec 2, 2020
a02ba1f
Fix links
JonathanFingold Dec 2, 2020
f4f1c70
fix more links
JonathanFingold Dec 2, 2020
281755c
Fix one more link
JonathanFingold Dec 2, 2020
d0fc089
Update bot-service-resources-faq-security.md
Dec 2, 2020
f3edb4a
Merge pull request #2485 from MicrosoftDocs/jf/cs-templates-r11
JonathanFingold Dec 3, 2020
bb41ac0
Added new FAQ entry
Dec 3, 2020
1e1318b
Apply suggestions from code review
Dec 3, 2020
bbc675c
Update bot-builder-security-enhanced.md
Dec 3, 2020
2bd19f9
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/Microso…
Dec 3, 2020
bad7037
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold Dec 3, 2020
a7be994
Merge pull request #2472 from MicrosoftDocs/mm-bot-enhanced-dl-oauth
JonathanFingold Dec 3, 2020
c002b7b
Update bot-service-channel-connect-directline.md
Dec 3, 2020
7af0ead
Update bot-service-channel-connect-directline.md
Dec 3, 2020
a4f3a37
Update bot-service-channel-connect-directline.md
Dec 3, 2020
a8d2440
Removed link syntax.
jdmartinez36 Dec 4, 2020
a1144e5
Merge pull request #2488 from MicrosoftDocs/mm-bot-enhanced-auth-adde…
JonathanFingold Dec 7, 2020
9a8f237
Merge branch 'master' into mm-bot-add-faq-entry
JonathanFingold Dec 7, 2020
2b7ce5c
Fix various issues
JonathanFingold Dec 7, 2020
56ece5b
Merge pull request #2490 from MicrosoftDocs/jf/telemetry-1207
JonathanFingold Dec 7, 2020
82bea80
Updated links to cross-repo.
jdmartinez36 Dec 7, 2020
5386501
Merge branch 'master' into linksyntaxbranch
JonathanFingold Dec 7, 2020
052ccc7
Added new troubleshooting entry
Dec 7, 2020
3da756f
Merge pull request #2489 from jdmartinez36/linksyntaxbranch
JonathanFingold Dec 7, 2020
674b520
Fixed title
Dec 7, 2020
01540f6
Update TOC.yml
Dec 8, 2020
9cf71fb
Update TOC.yml
Dec 8, 2020
a7fc422
Update bot-service-resources-faq-general.md
Dec 8, 2020
1a8ce7a
Update bot-builder-howto-add-media-attachments.md
Dec 9, 2020
172a646
Update bot-builder-howto-add-media-attachments.md
Dec 9, 2020
e26ac0c
Merge pull request #2492 from MicrosoftDocs/mm-bot-security-toc-impro…
JonathanFingold Dec 9, 2020
866233b
Merge branch 'master' into mm-bot-add-faq-entry
JonathanFingold Dec 9, 2020
0ae72c9
Merge pull request #2486 from MicrosoftDocs/mm-bot-add-faq-entry
JonathanFingold Dec 9, 2020
0f2ddfb
fixed link to iso 8601 wiki page
Dec 9, 2020
0f162c3
Update bot-service-troubleshoot-general-problems.md
Dec 9, 2020
c1aef89
Add installation update info
JonathanFingold Dec 9, 2020
e968301
fix link
JonathanFingold Dec 9, 2020
67ad040
Update articles/bot-service-troubleshoot-general-problems.md
Dec 9, 2020
bc196f9
Merge pull request #2493 from MicrosoftDocs/jf/activity-handler-1209
JonathanFingold Dec 9, 2020
f47b378
Update bot-service-channel-connect-email.md
Dec 9, 2020
3820988
Update bot-service-channel-connect-email.md
Dec 9, 2020
c9c2a65
Update bot-service-channel-connect-email.md
Dec 10, 2020
5138dc7
Update snippet-channeldata.md
Dec 10, 2020
076f43a
Update bot-service-channel-connect-email.md
Dec 10, 2020
056fb96
Fixed include file, shared this file . fixed content
Dec 11, 2020
468185a
Update snippet-channeldata.md
Dec 11, 2020
dd9b338
Fixed content
Dec 11, 2020
8ae2653
Fixed content
Dec 11, 2020
1ef8bb6
Update snippet-channelData-email.md
Dec 11, 2020
4f56d9b
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1927
Dec 11, 2020
cfe6cdb
Fixed content based on feedback. Added images.
Dec 14, 2020
fef2b0b
Update bot-service-troubleshoot-general-problems.md
Dec 14, 2020
421acd3
Update bot-service-troubleshoot-general-problems.md
Dec 14, 2020
3668090
Fixed content and added a couple of supporting images.
Dec 15, 2020
1e6ff41
Fixed image
Dec 15, 2020
c641291
Merge branch 'master' into mm-email-channeldata-schema
JonathanFingold Dec 15, 2020
b8bff07
Update bot-service-channel-directline.md
Dec 15, 2020
8f0a135
Merge pull request #2494 from MicrosoftDocs/mm-email-channeldata-schema
JonathanFingold Dec 16, 2020
3ec0db8
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1927
JonathanFingold Dec 16, 2020
f0ebaf4
Merge pull request #2484 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Dec 16, 2020
c2ac006
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 16, 2020
16889e5
Update bot-service-channel-directline.md
Dec 16, 2020
976b5b1
Update bot-framework-rest-connector-api-reference.md
Dec 17, 2020
9599a39
Merge branch 'master' into mm-bot-dl-speech
JonathanFingold Dec 17, 2020
23330a5
Merge pull request #2497 from MicrosoftDocs/mm-bot-dl-speech
JonathanFingold Dec 17, 2020
68b9929
Added images and fixed content.
Dec 17, 2020
c78ad6c
Update articles/rest-api/bot-framework-rest-connector-api-reference.md
Dec 17, 2020
80304bf
Update directline-speech-bot.md
Dec 17, 2020
9aaa7ea
Merge branch 'master' into mm-bot-rest-api-http-status-codes
JonathanFingold Dec 17, 2020
8605f4a
Merge pull request #2498 from MicrosoftDocs/mm-bot-rest-api-http-stat…
JonathanFingold Dec 17, 2020
be2025d
Update bot-service-overview-introduction.md
Dec 18, 2020
9bd62b9
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
JonathanFingold Dec 18, 2020
732b15a
Update articles/bot-service-troubleshoot-general-problems.md
Dec 21, 2020
fb62147
Apply suggestions from code review
Dec 21, 2020
43ffc41
Update bot-service-troubleshoot-general-problems.md
Dec 21, 2020
d9ad673
Merge branch 'mm-bot-test-network-connectivity' of https://github.com…
Dec 21, 2020
09039e4
Update bot-service-troubleshoot-general-problems.md
Dec 21, 2020
91dd6e8
Merge branch 'master' into mm-bot-channel-fb
Dec 21, 2020
c440d16
Apply suggestions from code review
Dec 21, 2020
739c190
Update bot-builder-lu-file-format.md
Dec 21, 2020
f308a6f
Merge branch 'master' into mm-bot-test-network-connectivity
JonathanFingold Dec 21, 2020
a07332d
Merge pull request #2491 from MicrosoftDocs/mm-bot-test-network-conne…
JonathanFingold Dec 21, 2020
aa0e66e
Apply suggestions from code review
Dec 21, 2020
304c97a
Update quickstart-dotnet-prerequisites.md
Dec 21, 2020
3959188
Update snippet-deploy-without-bot.md
Dec 22, 2020
a01efd5
Fixed typos.
Dec 22, 2020
2a589d7
Update bot-service-channel-directline-extension.md
Dec 22, 2020
05568f2
Update bot-service-channel-connect-facebook.md
Dec 22, 2020
37fd2da
Update bot-service-design-user-experience.md
Dec 22, 2020
ba1dd2f
Merge branch 'master' into mm-bot-channel-fb
JonathanFingold Dec 22, 2020
4f350f6
Merge pull request #2496 from MicrosoftDocs/mm-bot-channel-fb
JonathanFingold Dec 22, 2020
2732d48
Update bot-builder-webchat-overview.md
Dec 22, 2020
269112d
Update bot-builder-webchat-overview.md
Dec 23, 2020
0b7deaa
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Dec 23, 2020
8aa21f1
Update bot-builder-webchat-overview.md
Dec 23, 2020
09cfa28
Moved v3 section to FAQ article
Dec 23, 2020
7ee8429
Update contributor-guide-index.md
JonathanFingold Dec 23, 2020
db93632
Merge branch 'master' into mm-bot-fix-issues
JonathanFingold Dec 23, 2020
7adb045
Merge pull request #2499 from MicrosoftDocs/mm-bot-fix-issues
JonathanFingold Dec 23, 2020
9f49cc5
Add GitHub tips and tricks article
JonathanFingold Dec 23, 2020
29bd5e2
Added links in the index page and organized content
Dec 23, 2020
85c52c2
Update bot-service-resources-bot-framework-faq.md
Dec 23, 2020
8320fc5
Update bot-builder-webchat-overview.md
Dec 23, 2020
7756a4b
Merge branch 'master' into mm-bot-webchat-cleanup
Dec 23, 2020
f1b622b
Added links fixed wording
Dec 23, 2020
9b2de96
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 23, 2020
5b0615f
Merge branch 'master' into jf/contrib-1223
JonathanFingold Dec 23, 2020
c3d787d
Update bot-builder-webchat-overview.md
Dec 23, 2020
84ea173
Merge pull request #2502 from MicrosoftDocs/jf/contrib-1223
JonathanFingold Dec 23, 2020
9f2f37c
Add messageBack to table, convert table to snippet
JonathanFingold Dec 23, 2020
2c98bde
Fixed content
Dec 23, 2020
f9148cc
Update snippet-card-action-types.md
JonathanFingold Dec 23, 2020
3d5c627
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Dec 23, 2020
51009d2
Changed AKA links to relative path or site-relative link.s
WashingtonKayaker Dec 23, 2020
9ddee5b
Merge pull request #2500 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Dec 23, 2020
6c890bd
Merge branch 'master' into jf/messageBack
Dec 23, 2020
4e171dc
Merge branch 'live' into master
JonathanFingold Dec 23, 2020
772e2fe
Update what-is-new-archive.md
WashingtonKayaker Dec 23, 2020
d9966e0
Merge branch 'master' into SM-AKA-Link-Conversion
WashingtonKayaker Dec 23, 2020
2a5af38
link issues
WashingtonKayaker Dec 24, 2020
95e98c9
minor updates to fix checkin validation warnings.
WashingtonKayaker Dec 24, 2020
cb15f3f
Update articles/includes/snippet-card-action-types.md
JonathanFingold Dec 24, 2020
2e7f761
Fix random typos.
JonathanFingold Dec 24, 2020
5a8649d
Merge branch 'jf/messageBack' of https://github.com/MicrosoftDocs/bot…
JonathanFingold Dec 24, 2020
ba41064
Merge branch 'master' into jf/messageBack
JonathanFingold Dec 24, 2020
77b32f0
Merge pull request #2503 from MicrosoftDocs/jf/messageBack
JonathanFingold Dec 24, 2020
01d4338
Fix more typos
JonathanFingold Dec 24, 2020
6a10e1e
Merge pull request #2506 from MicrosoftDocs/jf/fixes-for-live-sync-1223
JonathanFingold Dec 24, 2020
8c1f668
Merge pull request #2505 from MicrosoftDocs/master
JonathanFingold Dec 24, 2020
a932bb4
Changed Adaptive Tool --> Adaptive Tools
Dec 27, 2020
5fca27f
changed tool --> tools in file name and related files
Dec 27, 2020
9144b3c
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 27, 2020
6111183
Update bot-service-resources-faq-availability.md
Dec 28, 2020
2dbe436
Apply suggestions from code review
Dec 28, 2020
070953c
Update articles/file-format/bot-builder-lg-file-format.md
Dec 28, 2020
d93d165
Update bot-service-resources-faq-availability.md
Dec 28, 2020
9ed9669
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 28, 2020
a9c2b9c
Update articles/bot-service-resources-faq-availability.md
Dec 28, 2020
d1ba2e4
removed references to lg and lu
Dec 28, 2020
fc318d4
Update bot-service-resources-faq-availability.md
Dec 28, 2020
e9b7229
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 28, 2020
c1dafaa
Update bot-service-resources-bot-framework-faq.md
Dec 28, 2020
b7739ce
Merge branch 'master' into mm-bot-webchat-cleanup
JonathanFingold Dec 28, 2020
e86dda6
Fix for bot-docs issue 1987
JonathanFingold Dec 28, 2020
f2a0234
Merge pull request #2501 from MicrosoftDocs/mm-bot-webchat-cleanup
JonathanFingold Dec 28, 2020
9504b15
Update bot-framework-rest-connector-api-reference.md
JonathanFingold Dec 28, 2020
1ca039d
Fixed quotes
Dec 28, 2020
904c968
Fixed quotes
Dec 28, 2020
06a893d
Update security-baseline.md
Dec 28, 2020
ca0215a
Update security-baseline.md
Dec 28, 2020
c2bb209
Update bot-service-design-pattern-knowledge-base.md
Dec 29, 2020
93f241d
Update bot-service-design-pattern-knowledge-base.md
Dec 29, 2020
a2046f3
Update bot-service-design-navigation.md
Dec 29, 2020
e168989
Update bot-service-manage-settings.md
Dec 29, 2020
007eb9a
Fixed alt-text
Dec 29, 2020
79753f9
Update bot-builder-telemetry.md
Dec 29, 2020
c4ef222
fix missing pdf template (#2511)
herohua Dec 29, 2020
98511a5
Merge branch 'master' into jf/http-status-codes
JonathanFingold Dec 29, 2020
6358213
Merge pull request #2507 from MicrosoftDocs/jf/http-status-codes
JonathanFingold Dec 29, 2020
90ee6bc
Merge branch 'master' into mm-wht-alt-text
JonathanFingold Dec 29, 2020
bfc6ccb
Merge pull request #2510 from MicrosoftDocs/mm-wht-alt-text
JonathanFingold Dec 29, 2020
85ff1e7
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 29, 2020
006460a
Update articles/bot-service-channel-connect-directlinespeech.md
WashingtonKayaker Dec 29, 2020
41829f1
Minor updates to bot-builder-telemetry-qnamaker.md
WashingtonKayaker Dec 29, 2020
6b9081a
Merge branch 'SM-AKA-Link-Conversion' of https://github.com/Microsoft…
WashingtonKayaker Dec 29, 2020
963aa65
Apply suggestions from code review
Dec 29, 2020
3673250
Update security-baseline.md
Dec 29, 2020
17e0e58
Merge branch 'mm-wht-curly-quotes' of https://github.com/MicrosoftDoc…
Dec 29, 2020
9b16054
Apply suggestions from code review
Dec 29, 2020
4b58e40
Feedback incorporated.
WashingtonKayaker Dec 29, 2020
a85a80e
fixed link
WashingtonKayaker Dec 29, 2020
e5346ee
Update articles/includes/bot-service-debug-bot/python-vscode.md
WashingtonKayaker Dec 29, 2020
e66acf1
Update articles/includes/telemetry-javascript-main.md
WashingtonKayaker Dec 29, 2020
7da4937
Update articles/includes/telemetry-dotnet-main.md
WashingtonKayaker Dec 29, 2020
9a2ec8b
Update articles/includes/telemetry-dotnet-main.md
WashingtonKayaker Dec 29, 2020
d264e21
Update bot-builder-concept-adaptive-dialog-generators.md
WashingtonKayaker Dec 29, 2020
27a0233
Merge branch 'SM-AKA-Link-Conversion' of https://github.com/Microsoft…
WashingtonKayaker Dec 29, 2020
f71f12a
Merge branch 'master' into SM-AKA-Link-Conversion
JonathanFingold Dec 29, 2020
822d31e
Merge pull request #2504 from MicrosoftDocs/SM-AKA-Link-Conversion
JonathanFingold Dec 29, 2020
ff8cf6e
Merge branch 'master' into mm-wht-curly-quotes
JonathanFingold Dec 29, 2020
a0dbc7d
Merge pull request #2509 from MicrosoftDocs/mm-wht-curly-quotes
JonathanFingold Dec 29, 2020
48876f9
Update contributor-guide-pr-criteria.md
Dec 29, 2020
24ebd42
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 30, 2020
ca8ff44
Merge branch 'master' into mm-wht-curly-quotes-internal-guides
JonathanFingold Dec 30, 2020
f783886
Merge pull request #2508 from MicrosoftDocs/mm-wht-curly-quotes-inter…
JonathanFingold Dec 30, 2020
ab76289
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
JonathanFingold Dec 30, 2020
a2d121c
Merge pull request #2482 from MicrosoftDocs/v-emolsh/11-2020/debug-ad…
JonathanFingold Dec 30, 2020
d140516
Update quickstart-python-prerequisites.md
Dec 31, 2020
6edd49e
Merge pull request #2514 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Jan 4, 2021
1b9bd37
mm-wht-here-links (#2515)
Jan 5, 2021
401f28c
Issue 1982 fix - replace unowned AKA links (#2516)
Jan 6, 2021
7b5b341
Add a text formatting article to the local contributors guide (#2517)
JonathanFingold Jan 7, 2021
776c4fd
Fixed broken link (#2520)
WashingtonKayaker Jan 7, 2021
c205c08
Fixed file extention formating for .lu, .lg, .qna (#2522)
WashingtonKayaker Jan 7, 2021
bd137fe
Fixed file extension formatting for .lu, .lg, .qna in all remaining f…
WashingtonKayaker Jan 7, 2021
20b5d95
zxyanliu-grammar-pass (1/4) (#2524)
zxyanliu Jan 11, 2021
03dbf3f
Grammar, tone, spelling, and typography pass (jf: 1/x) (#2512)
JonathanFingold Jan 11, 2021
3e20411
Changes to grammar and formatting, with minor technical changes. (#2525)
WashingtonKayaker Jan 11, 2021
bcdacac
Update bot-builder-howto-cross-train.md (#2473)
WashingtonKayaker Jan 12, 2021
dcb546e
mm-wht-doc-cleanup-01 (#2518)
Jan 12, 2021
4fe19f0
Grammar pass on bot-builder-dotnet-sdk-quickstart (#2530)
WashingtonKayaker Jan 12, 2021
9efc030
Merge branch 'master' of https://github.com/MicrosoftDocs/bot-docs-pr…
v-alje Jan 12, 2021
35f1084
Moving reference to new repo
v-alje Jan 12, 2021
2ca38ab
Fixing invalid json
v-alje Jan 12, 2021
b6275a0
mm-bot-snippet-update (#2527)
Jan 12, 2021
4e58702
mm-wht-writers-faqs (#2513)
Jan 12, 2021
b4ed2f2
mm-wht-public-faqs (#2519)
Jan 12, 2021
b62a465
Update TOC.yml (#2539)
Jan 13, 2021
e80161b
Update bot-framework-glossary.md (#2521)
JonathanFingold Jan 13, 2021
9947e63
Merge branch 'master' into smoke-test
v-alje Jan 13, 2021
4bdf31c
Merge pull request #2537 from MicrosoftDocs/smoke-test
v-alje Jan 14, 2021
f06b02b
Port Artur's changes to the bot-docs-pr repo. (#2534)
JonathanFingold Jan 14, 2021
e523d1d
zxyanliu/grammar pass 2/4 (#2536)
zxyanliu Jan 14, 2021
7465e57
TIP on handling the "none" intent (#2495)
WashingtonKayaker Jan 14, 2021
9a85232
Formatting text guide updates (#2546)
Jan 15, 2021
cf132ae
Incorporate fixes from bot-docs PRs. (#2543)
JonathanFingold Jan 15, 2021
acafa55
mm-wht-writers-faqs (#2544)
Jan 19, 2021
c12209d
Merge branch 'live' into master
v-alje Jan 19, 2021
aa5cc17
Merge pull request #2549 from MicrosoftDocs/master
v-alje Jan 19, 2021
662e41d
Release 'live' 01-20-2021 (#2551)
JonathanFingold Jan 22, 2021
7e32468
Initialize Docs repository: https://github.com/MicrosoftDocs/bot-docs…
v-alje Jan 26, 2021
22a92bc
Release 'live' 02-11-2021 (#2587)
JonathanFingold Feb 12, 2021
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
Prev Previous commit
Next Next commit
zxyanliu/grammar pass 2/4 (#2536)
* grammar check1/12

* Update bot-builder-howto-bf-cli-deploy-qna.md

* update grammar check

* Update bot-service-resources-user-agent.md

* Update articles/bot-service-channel-connect-slack.md

Co-authored-by: Michael Miele <[email protected]>

Co-authored-by: Michael Miele <[email protected]>
Co-authored-by: Jonathan Fingold <[email protected]>
  • Loading branch information
3 people authored Jan 14, 2021
commit e523d1da9fc2545d538b1ddcd20f322cdedd1f7f
3 changes: 1 addition & 2 deletions articles/bot-service-channel-connect-directline.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ This article describes how to connect a bot to the **Direct Line channel**. Use
> NOTE
> The Direct Line is a standard channel over HTTPS protocol to allow communication between a client application and a bot. If you require network isolation instead, use the [Direct Line App Service Extension](bot-service-channel-directline-extension.md) over [WebSocket protocol](https://tools.ietf.org/html/rfc6455).


## Add the Direct Line channel

The first thing you must do is to add the Direct Line channel to the bot.
Expand Down Expand Up @@ -110,7 +109,7 @@ The example contains two projects:
</appSettings>
```

User messages are sent to the Bot using the Direct Line Client `Conversations.PostActivityAsync` method using the `ConversationId` generated previously.
User messages are sent to the bot using the Direct Line Client `Conversations.PostActivityAsync` method using the `ConversationId` generated previously.

```csharp
while (true)
Expand Down
16 changes: 8 additions & 8 deletions articles/bot-service-channel-connect-slack.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This article shows how to add a Slack channel to a bot. Select one of the follow
![Set up bot](~/media/channels/slack-NewApp.png)

1. Click **Create New App**.
1. In the **App Name** box, enter the name of your Slack application
1. In the **App Name** box, enter the name of your Slack application.
1. In the **Development Slack Team** box, enter the name of your development 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)
Expand Down Expand Up @@ -93,7 +93,7 @@ If your bot will use Slack-specific functionality such as buttons, follow these
### Add the Slack channel to the bot

1. In the left panel, select the **Basic Information** item.
1. In the right panel, scroll to the **App Credentials** section. The **Client ID**, **Client Secret**, and **Signing Secrte** required for configuring your Slack bot channel are displayed. Copy and store these credentials in safe place.
1. In the right panel, scroll to the **App Credentials** section. The **Client ID**, **Client Secret**, and **Signing Secret** required for configuring your Slack bot channel are displayed. Copy and store these credentials in safe place.

![Gather credentials](~/media/channels/slack-AppCredentials.png)

Expand Down Expand Up @@ -130,16 +130,16 @@ Authorized users can click the **Add to Slack** button provided by this modified

### Connect a bot to Slack using the Slack adapter

As well as the channel available in the Azure Bot Service to connect your bot with Slack, you can also use the Slack adapter. In this article you will learn how to connect a bot to Slack using the adapter. This article will walk you through modifying the EchoBot sample to connect it to a Slack app.
As well as the channel available in the Azure Bot Service to connect your bot with Slack, you can also use the Slack adapter. In this article you will learn how to connect a bot to Slack using the adapter. This article will walk you through modifying the EchoBot sample to connect it to a Slack app.

> [!NOTE]
> The instructions below cover the C# implementation of the Slack adapter. For instructions on using the JS adapter, part of the BotKit libraries, [see the BotKit Slack documentation](https://botkit.ai/docs/v4/platforms/slack.html).

### Prerequisites

* The [EchoBot sample code](https://github.com/microsoft/BotBuilder-Samples/tree/master/samples/csharp_dotnetcore/02.echo-bot)
- The [EchoBot sample code](https://github.com/microsoft/BotBuilder-Samples/tree/master/samples/csharp_dotnetcore/02.echo-bot)

* Access to a Slack workspace with sufficient permissions to create and manage applications at [https://api.slack.com/apps](https://api.slack.com/apps). If you do not have access to a Slack environment you can create a workspace for [free](https://www.slack.com).
- Access to a Slack workspace with sufficient permissions to create and manage applications at [https://api.slack.com/apps](https://api.slack.com/apps). If you do not have access to a Slack environment you can create a workspace for [free](https://www.slack.com).

### Create a Slack application and configure it for your bot

Expand Down Expand Up @@ -201,7 +201,7 @@ public class SlackAdapterWithErrorHandler : SlackAdapter

#### Create a new controller for handling Slack requests

We create a new controller which will handle requests from your slack app, on a new endpoing 'api/slack' instead of the default 'api/messages' used for requests from Azure Bot Service Channels. By adding an additional endpoint to your bot, you can accept requests from Bot Service channels, as well as from Slack, using the same bot.
We create a new controller which will handle requests from your slack app, on a new endpoint `api/slack` instead of the default `api/messages` used for requests from Azure Bot Service Channels. By adding an additional endpoint to your bot, you can accept requests from Bot Service channels, as well as from Slack, using the same bot.

```csharp
[Route("api/slack")]
Expand Down Expand Up @@ -246,7 +246,7 @@ Add the following line to the ***ConfigureServices*** method within your startup
services.AddSingleton<SlackAdapter, SlackAdapterWithErrorHandler>();
```

Once added, your ***ConfigureServices*** method shold look like this.
Once added, your ***ConfigureServices*** method should look like this.

```csharp
public void ConfigureServices(IServiceCollection services)
Expand Down Expand Up @@ -303,7 +303,7 @@ Navigate back to the [Slack API dashboard](https://api.slack.com/apps) and selec

1. Log in the Slack work space where you installed your app (`http://<your work space>-group.slack.com/`). You will see it listed under the **Apps** section in the left panel.
1. In the left panel, select your app.
1. In the right panel, wite e message and send it to the application. If you used an echo bot, the application echoes back the message as shown in the figure below.
1. In the right panel, write e message and send it to the application. If you used an echo bot, the application echoes back the message as shown in the figure below.

![app testing](~/media/channels/slack-echobotapp-test.png)

Expand Down
12 changes: 6 additions & 6 deletions articles/bot-service-channel-directline.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ ms.date: 10/05/2020
---

# About Direct Line
[!INCLUDE [applies-to-v4](includes/applies-to-v4-current.md)]
The Bot Framework offers multiple channels with the Direct Line branding. It is important that you select the version that best fits the conversational A.I. experience you are designing.

[!INCLUDE [applies-to-v4](includes/applies-to-v4-current.md)]
The Bot Framework offers multiple channels with the Direct Line branding. It is important that you select the version that best fits the conversational AI experience you are designing.

- **Direct Line**. This is the standard channel offering of Direct Line. It works by default with bot templates via the [Azure portal](https://ms.portal.azure.com/), bots from the [Bot Builder Samples](https://github.com/Microsoft/BotBuilder-Samples/blob/main/README.md), and bots created with the [Azure CLI](https://docs.microsoft.com/cli/azure/what-is-azure-cli). This is the Direct Line best suited in the majority of the cases. See [Connect a bot to Direct Line](bot-service-channel-connect-directline.md).
- **Direct Line Speech**. It provides text to speech and speech to text services within the channel. It allows a client to stream audio directly to the channel which will then be converted to text and sent to the bot. The Direct Line Speech is also able to convert text messages from the bot into audio messages as spoken by a variety of A.I. powered voices. Combined, this makes Direct Line Speech capable of having audio only conversations with clients. See [Connect a bot to Direct Line Speech](bot-service-channel-connect-directlinespeech.md).
Expand All @@ -23,13 +23,13 @@ The Bot Framework offers multiple channels with the Direct Line branding. It is
You can choose which offering of Direct Line is best for you by evaluating the features each offers and the needs of your solution.
Over time these offerings will be simplified.

| Feature | Direct Line | Direct Line App Service Extension | Direct Line Speech |
|----------------------------|-------------|-----------------------------------|--------------------|
| Availability and Licensing | GA | GA | GA |
| Feature | Direct Line | Direct Line App Service Extension | Direct Line Speech |
|--------------|-------------|-----------------------------------|--------------------|
| Availability and Licensing | GA | GA | GA |
| Speech recognition and text-to-speech performance | Standard | Standard | High performance |
| Supports legacy web browsers | Yes | Yes | Yes |
| Bot Framework SDK support | All v3, v4 | v4.63+ required | v4.63+ required |
| Client SDK support | JS, C# | JS, C# | C++, C#, Unity, JS|
| Client SDK support | JS, C# | JS, C# | C++, C#, Unity, JS|
| Works with Web Chat | Yes | Yes | Yes |
| VNET | No | Yes | No |

Expand Down
1 change: 1 addition & 0 deletions articles/bot-service-manage-analytics.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,5 @@ To find this value, open Application Insights and navigate to **Configure** > **
For more information on how to locate these values, see [Application Insights keys](~/bot-service-resources-app-insights-keys.md).

## Additional resources

* [Application Insights keys](~/bot-service-resources-app-insights-keys.md)
2 changes: 1 addition & 1 deletion articles/bot-service-resources-user-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you're reading this message, you may have received a request from a Microsoft

If you received a request from our service, it likely had a User-Agent header formatted similar to the string below:

```User-Agent: BF-DirectLine/3.0 (Microsoft-BotFramework/3.0 +https://botframework.com/ua)```
`User-Agent: BF-DirectLine/3.0 (Microsoft-BotFramework/3.0 +https://botframework.com/ua)`

The most important part of this string is the **Microsoft-BotFramework** identifier, which is used by the Microsoft Bot Framework, a collection of tools and services that allows independent software developers to create and operate their own bots.

Expand Down
6 changes: 2 additions & 4 deletions articles/v4sdk/bot-builder-concept-authentication-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ When you register a bot in the Azure portal, for example via the **Bot Channels

When a channel sends a request to a bot, via the Bot Connector service, it specifies a **token** in the **Authorization header** of the request. The bot authenticates calls from the Bot Connector service by verifying the authenticity of the token.


When the bot sends a request to a channel via the **Bot Connector service**, it must specify the **token** in the **Authorization header** of the request.
All requests must include the access token which is verified by the Bot Connector service to authorize the request.

The operations described are automatically performed by the Bot Framework SDK.

For more details, see the REST API documentation on how to [authenticate requests from the Bot Connector service to your bot](~/rest-api/bot-framework-rest-connector-authentication.md#connector-to-bot) and [authenticate requests from your bot to the Bot Connector service](~/rest-api/bot-framework-rest-connector-authentication.md#bot-to-connector).

### Channels

Typically, channels communicate with a bot via the **Bot Connector service** this means that the previous authentication principles generally apply. You may want to notice characteristics of specific channels.
Typically, channels communicate with a bot via the **Bot Connector service**. This means that the previous authentication principles generally apply. You may want to notice characteristics of specific channels.

#### Direct Line

Expand All @@ -62,10 +62,8 @@ The client application authenticates requests to Direct Line (version 3.0) eithe
> [!IMPORTANT]
> When you use Azure Bot Service authentication with Web Chat there are some important security considerations you must keep in mind. For more information, see the [security considerations](~/bot-service-channel-connect-webchat.md#keep-your-secret-hidden-exchange-your-secret-for-a-token-and-generate-the-embed) section in the REST authentication article.


For more information, see [Keep your secret hidden, exchange your secret for a token, and generate the embed](~/bot-service-channel-connect-webchat.md#keep-your-secret-hidden-exchange-your-secret-for-a-token-and-generate-the-embed).


#### Web Chat

The Web Chat has two implementations: the **channel** and the **control**.
Expand Down
31 changes: 21 additions & 10 deletions articles/v4sdk/bot-builder-howto-bf-cli-deploy-qna.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,25 @@ The Bot Framework Command Line Interface (CLI) lets you automate the management

This article describes how to perform some common tasks used to deploy a QnA Maker KB using the Bot Framework CLI.

1. [Create your QnA Maker resource in Azure Cognitive Services](#create-your-qna-maker-resource-in-azure-cognitive-services)
1. [Install the Bot Framework CLI](#install-the-bot-framework-cli)
1. [Create your QnA Maker initialization file](#create-your-qna-maker-initialization-file)
1. [Create your QnA Maker model](#create-your-qna-maker-model)
1. [Create your QnA Maker knowledge base](#create-your-qna-maker-knowledge-base)
1. [Test your QnA Maker knowledge base](#test-your-qna-maker-knowledge-base)
1. [Publish your QnA Maker knowledge base](#publish-your-qna-maker-knowledge-base)
1. [Create a QnA Maker knowledge base and publish it to production using the build command](#create-a-qna-maker-knowledge-base-and-publish-it-to-production-using-the-build-command)
- [Deploy QnA Maker knowledge base using the Bot Framework qnamaker CLI commands](#deploy-qna-maker-knowledge-base-using-the-bot-framework-qnamaker-cli-commands)
- [Prerequisites](#prerequisites)
- [Using the qnamaker CLI commands to enable QnA Maker in your bot](#using-the-qnamaker-cli-commands-to-enable-qna-maker-in-your-bot)
- [Create your QnA Maker resource in Azure Cognitive Services](#create-your-qna-maker-resource-in-azure-cognitive-services)
- [Install the Bot Framework CLI](#install-the-bot-framework-cli)
- [Create your QnA Maker initialization file](#create-your-qna-maker-initialization-file)
- [Create your QnA Maker model](#create-your-qna-maker-model)
- [Create your QnA Maker knowledge base](#create-your-qna-maker-knowledge-base)
- [Test your QnA Maker knowledge base](#test-your-qna-maker-knowledge-base)
- [Publish your QnA Maker knowledge base](#publish-your-qna-maker-knowledge-base)
- [Create a QnA Maker knowledge base and publish it to production using the build command](#create-a-qna-maker-knowledge-base-and-publish-it-to-production-using-the-build-command)
- [How to use the build command](#how-to-use-the-build-command)
- [The qnamaker:build parameters](#the-qnamakerbuild-parameters)
- [The qnamaker configuration file](#the-qnamaker-configuration-file)
- [QnA and multiple language variations](#qna-and-multiple-language-variations)
- [QnA Maker Knowledge Bases created](#qna-maker-knowledge-bases-created)
- [The settings file generated using the build command](#the-settings-file-generated-using-the-build-command)
- [The dialog file](#the-dialog-file)
- [Additional information](#additional-information)

Once your bot project's QnA Maker KB .qna files have been created, you are ready to follow the steps outlined in this article to create your QnA Maker KB. If you do not have a project with QnA Maker KB .qna files, you can use the [QnAMaker][qna-maker-sample]. See the sample repository's readme for information on [Getting the samples][getting-the-samples].

Expand Down Expand Up @@ -244,7 +255,7 @@ The pattern for the .qna file name when language variants are used is as follows

For example:

```
```qna
example.en-us.qna
example.fr-fr.qna
example.de-de.qna
Expand All @@ -267,7 +278,7 @@ The QnA Maker KB name:

For example, if your botName is _MyProject_ and your username is _YuuriTanaka_, the names of your KBs would be as follows:

```
```qna
MyProject(YuuriTanaka).en-us.qna
MyProject(YuuriTanaka).fr-fr.qna
MyProject(YuuriTanaka).de-de.qna
Expand Down
Loading