Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
237e09f
Delete regexp-recognizer.gif
zxyanliu Dec 19, 2019
40d6a35
Delete weather-intent.png
zxyanliu Dec 19, 2019
6e2cf66
Add files via upload
zxyanliu Dec 19, 2019
f78343e
Update bot-tutorial-add-dialog.md
zxyanliu Dec 19, 2019
3163f99
Delete choice-and-inline.png
zxyanliu Dec 19, 2019
c6ac4b9
Add files via upload
zxyanliu Dec 19, 2019
8cc614e
Update how-to-ask-for-user-input.md
zxyanliu Dec 19, 2019
913ada2
Update how-to-ask-for-user-input.md
zxyanliu Dec 19, 2019
81104d5
Update how-to-send-messages.md
zxyanliu Dec 19, 2019
98e8b8c
Delete composer-overview.png
zxyanliu Dec 24, 2019
3655159
Add files via upload
zxyanliu Dec 24, 2019
42950fb
Revert "Add files via upload"
zxyanliu Dec 24, 2019
9c4d9aa
Revert "Delete composer-overview.png"
zxyanliu Dec 24, 2019
b2212ca
Update setup-yarn.md
zxyanliu Dec 24, 2019
b71974d
Update setup-yarn.md
zxyanliu Dec 24, 2019
7380640
Update concept-memory.md
zxyanliu Dec 26, 2019
e2f2800
Delete memory-mainpulation-menu.png
zxyanliu Dec 27, 2019
8eb5b04
Add files via upload
zxyanliu Dec 27, 2019
4f4735a
Update concept-memory.md
zxyanliu Dec 27, 2019
d3fc41b
Update bfcomposer-intro.md
zxyanliu Jan 2, 2020
0280d3d
Delete new_bot.png
zxyanliu Jan 2, 2020
8a840dc
Add files via upload
zxyanliu Jan 2, 2020
8e2fc7e
Update concept-dialog.md
zxyanliu Jan 2, 2020
7bef114
Delete trigger_menu.gif
zxyanliu Jan 2, 2020
cbe8851
Delete action_menu.gif
zxyanliu Jan 2, 2020
b04e9f3
Add files via upload
zxyanliu Jan 2, 2020
9f99b2b
Delete main_child_dialog.png
zxyanliu Jan 2, 2020
b0689d4
Add files via upload
zxyanliu Jan 2, 2020
626be31
Update concept-dialog.md
zxyanliu Jan 2, 2020
3ab3ff3
Update concept-memory.md
zxyanliu Jan 2, 2020
e3bed75
Add files via upload
zxyanliu Jan 2, 2020
9c0d86b
Update concept-events-and-triggers.md
zxyanliu Jan 2, 2020
8154b60
Update concept-events-and-triggers.md
zxyanliu Jan 2, 2020
5b7530d
Delete trigger_menu.png
zxyanliu Jan 2, 2020
317f988
Add files via upload
zxyanliu Jan 2, 2020
4964497
Update bot-tutorial-get-weather.md
zxyanliu Jan 2, 2020
1c88d21
Update bot-tutorial-get-weather.md
zxyanliu Jan 2, 2020
cc6c8c3
Delete zipcode-answer.png
zxyanliu Jan 2, 2020
664d9f3
Delete zipcode-extensions.png
zxyanliu Jan 2, 2020
74b33e5
Delete zipcode-flow.png
zxyanliu Jan 2, 2020
99189c6
Delete http-step.png
zxyanliu Jan 2, 2020
5b52201
Delete http-props.png
zxyanliu Jan 2, 2020
4663494
Delete ifelse.png
zxyanliu Jan 2, 2020
2334c6f
Delete ifelse2.png
zxyanliu Jan 2, 2020
38bb4ed
Add files via upload
zxyanliu Jan 2, 2020
f79f633
Update how-to-define-triggers.md
zxyanliu Jan 6, 2020
a541081
Update concept-dialog.md
zxyanliu Jan 6, 2020
554b92e
Update concept-events-and-triggers.md
zxyanliu Jan 6, 2020
8d1ec62
Update concept-language-understanding.md
zxyanliu Jan 6, 2020
6da134a
Update how-to-send-messages.md
zxyanliu Jan 6, 2020
afdbe47
Update how-to-use-LUIS.md
zxyanliu Jan 6, 2020
8642cef
Update how-to-send-cards.md
zxyanliu Jan 6, 2020
81fe101
Delete help-dialog.png
zxyanliu Jan 6, 2020
9586f71
Add files via upload
zxyanliu Jan 6, 2020
e1ffd41
Delete help-intent.png
zxyanliu Jan 6, 2020
95fdf27
Add files via upload
zxyanliu Jan 6, 2020
234e9db
Delete cancel-trigger.png
zxyanliu Jan 6, 2020
626941d
Add files via upload
zxyanliu Jan 6, 2020
0bfbf30
Delete nav1.png
zxyanliu Jan 6, 2020
57d98fc
Add files via upload
zxyanliu Jan 6, 2020
5a3b1bd
Delete nav1.png
zxyanliu Jan 6, 2020
1e19534
Add files via upload
zxyanliu Jan 6, 2020
ca69f11
Delete botsays.png
zxyanliu Jan 6, 2020
92c40de
Add files via upload
zxyanliu Jan 6, 2020
d426ef3
Delete editmode.png
zxyanliu Jan 6, 2020
d9e196e
Add files via upload
zxyanliu Jan 6, 2020
31ff529
Update bot-tutorial-lg.md
zxyanliu Jan 6, 2020
c20dd13
Delete lg-2.png
zxyanliu Jan 6, 2020
e174eac
Add files via upload
zxyanliu Jan 6, 2020
e343e49
Delete nice-weather.png
zxyanliu Jan 6, 2020
ed39859
Add files via upload
zxyanliu Jan 6, 2020
8cd60db
Delete lg-2.png
zxyanliu Jan 6, 2020
6911545
Add files via upload
zxyanliu Jan 6, 2020
0667189
Delete nice-weather.png
zxyanliu Jan 6, 2020
4c717f4
Add files via upload
zxyanliu Jan 6, 2020
d5cd37b
Delete nice-weather.png
zxyanliu Jan 6, 2020
511fbef
Add files via upload
zxyanliu Jan 6, 2020
36170fd
Delete nav2.png
zxyanliu Jan 6, 2020
ee94ee8
Add files via upload
zxyanliu Jan 6, 2020
0ad4a53
Update bot-tutorial-cards.md
zxyanliu Jan 6, 2020
7c1fb08
Update concept-events-and-triggers.md
zxyanliu Jan 6, 2020
a330473
Update how-to-publish-bot.md
zxyanliu Jan 7, 2020
e222b1e
Update concept-language-generation.md
WashingtonKayaker Jan 10, 2020
69a5d78
Fixed problem in "Common expression language cheat sheet" table
WashingtonKayaker Jan 10, 2020
ef0299f
Suggestions to bfcomposer-intro.md
WashingtonKayaker Jan 10, 2020
063ae7b
Update concept-dialog.md
WashingtonKayaker Jan 10, 2020
730c324
Updates to concept-dialog.md
WashingtonKayaker Jan 10, 2020
be6c1ad
Updates to setup-yarn.md
WashingtonKayaker Jan 10, 2020
8966764
Updates to concept-language-understanding.md
WashingtonKayaker Jan 10, 2020
4fec79d
Update concept-memory.md
WashingtonKayaker Jan 10, 2020
5f19701
Revert "Fixed problem in "Common expression language cheat sheet" table"
zxyanliu Jan 14, 2020
be5a55a
Updates to concept-events-and-triggers.md
WashingtonKayaker Jan 14, 2020
afe767e
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
WashingtonKayaker Jan 14, 2020
cb1972c
Suggestions to article how-to-define-triggers.md
WashingtonKayaker Jan 16, 2020
f2517b2
Updates to tutorial-create-echobot.md
WashingtonKayaker Jan 16, 2020
e8a655a
Updates to tutorial-onboarding.md
WashingtonKayaker Jan 16, 2020
5caea6e
Updates to bot-tutorial-introduction.md
WashingtonKayaker Jan 17, 2020
9ec6d75
Updating the tutorial structure and adding an overview
WashingtonKayaker Jan 18, 2020
a9fd7c7
Updates to bot-tutorial-add-dialog.md
WashingtonKayaker Jan 22, 2020
d17c8b2
Updates to tutorial #3 bot-tutorial-get-weather.md
WashingtonKayaker Jan 23, 2020
225f6a2
Revert "Update concept-language-generation.md"
zxyanliu Jan 28, 2020
65d8525
Revert "Suggestions to bfcomposer-intro.md"
zxyanliu Jan 28, 2020
f31522e
Revert "Updates to tutorial #3 bot-tutorial-get-weather.md"
zxyanliu Jan 28, 2020
dbfbb5e
Revert "Updates to bot-tutorial-add-dialog.md"
zxyanliu Jan 28, 2020
d2c973f
Revert "Updating the tutorial structure and adding an overview"
zxyanliu Jan 28, 2020
213dfca
Revert "Updates to bot-tutorial-introduction.md"
zxyanliu Jan 28, 2020
fd71be4
Revert "Updates to tutorial-onboarding.md"
zxyanliu Jan 28, 2020
35bc890
Revert "Updates to tutorial-create-echobot.md"
zxyanliu Jan 28, 2020
bbec81d
Revert "Suggestions to article how-to-define-triggers.md"
zxyanliu Jan 28, 2020
04d028f
Revert "Updates to concept-events-and-triggers.md"
zxyanliu Jan 28, 2020
a07380a
Revert "Update concept-memory.md"
zxyanliu Jan 28, 2020
ad3f055
Revert "Updates to concept-language-understanding.md"
zxyanliu Jan 28, 2020
d0ed53a
Revert "Updates to setup-yarn.md"
zxyanliu Jan 28, 2020
a144fdc
Revert "Updates to concept-dialog.md"
zxyanliu Jan 28, 2020
3d17b92
Revert "Update concept-dialog.md"
zxyanliu Jan 28, 2020
bd22892
Update bot-tutorial-introduction.md
zxyanliu Jan 28, 2020
0423fbe
Delete zipcode-extensions.png
zxyanliu Jan 28, 2020
f7bcb09
Add files via upload
zxyanliu Jan 28, 2020
6f47c5e
Delete basic-help.gif
zxyanliu Jan 28, 2020
58d4331
Add files via upload
zxyanliu Jan 28, 2020
ad9a31a
Delete lg-1.png
zxyanliu Jan 28, 2020
ac102ac
Add files via upload
zxyanliu Jan 28, 2020
8241865
Update bot-tutorial-luis.md
zxyanliu Jan 28, 2020
3e07672
Delete luis-wired-up.png
zxyanliu Jan 28, 2020
0bf2048
Add files via upload
zxyanliu Jan 28, 2020
e82f6a8
Update bot-tutorial-luis.md
zxyanliu Jan 28, 2020
e78cc5b
Delete back-at-zipcode-prompt.png
zxyanliu Jan 28, 2020
96a415c
Add files via upload
zxyanliu Jan 28, 2020
fd7fd5f
Delete set-property-zipcode.png
zxyanliu Jan 28, 2020
fece6d9
Add files via upload
zxyanliu Jan 28, 2020
906ef32
Delete luis-score.png
zxyanliu Jan 28, 2020
f677c27
Add files via upload
zxyanliu Jan 28, 2020
5e342f3
update concept articles
zxyanliu Jan 29, 2020
b6f6c7b
update-concept-articles
zxyanliu Jan 29, 2020
29af483
Update toc.md
zxyanliu Jan 29, 2020
13d3079
lg+lu
zxyanliu Jan 29, 2020
92f318e
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 29, 2020
c9134ca
Update introduction.md
zxyanliu Jan 29, 2020
793a5b4
Update introduction.md
zxyanliu Jan 29, 2020
637f0c2
update create echo bot file name
zxyanliu Jan 29, 2020
ac7f3b5
update create echo bot file name
zxyanliu Jan 29, 2020
14d6812
change file name onboarding
zxyanliu Jan 29, 2020
355a5c8
Update toc.md
zxyanliu Jan 29, 2020
aef21a2
Update toc.md
zxyanliu Jan 29, 2020
b4df95b
Update toc.md
zxyanliu Jan 29, 2020
5286317
Update setup-yarn.md
zxyanliu Jan 29, 2020
e887941
Create tutorial-introduction.md
zxyanliu Jan 29, 2020
5be9e5f
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 29, 2020
98b8ea4
change tutorial names
zxyanliu Jan 29, 2020
68d104b
Update toc.md
zxyanliu Jan 29, 2020
30b962c
Update setup-yarn.md
zxyanliu Jan 29, 2020
878f218
Update address.png
zxyanliu Jan 29, 2020
9e9789f
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 29, 2020
821c644
Update setup-yarn.md
zxyanliu Jan 29, 2020
7f5503a
Update toc.md
zxyanliu Jan 29, 2020
ab55bf8
Update quickstart-create-bot.md
zxyanliu Jan 29, 2020
3e0f24c
Update tutorial-introduction.md
zxyanliu Jan 29, 2020
f269d46
Update tutorial-introduction.md
zxyanliu Jan 29, 2020
f829af5
Update tutorial-introduction.md
zxyanliu Jan 30, 2020
13a72df
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
f29fffe
tutorial-create-bot
zxyanliu Jan 30, 2020
e32a7fb
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
bf3583b
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
d774025
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
056f1ec
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
8d0025a
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
2230b14
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
2bd7f95
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
3bd42fb
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
c5354d4
Update tutorial-create-bot.md
zxyanliu Jan 30, 2020
aaac34d
update-tutorial-add-dialog
zxyanliu Jan 30, 2020
c0fc993
update-tutorial-add-dialog
zxyanliu Jan 30, 2020
711d86e
Update tutorial-add-dialog.md
zxyanliu Jan 30, 2020
9d399f8
Update tutorial-add-dialog.md
zxyanliu Jan 30, 2020
2d7c6c2
update-tutorial-get-weather
zxyanliu Jan 30, 2020
9bf3cca
Update tutorial-get-weather.md
zxyanliu Jan 30, 2020
89b593a
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
b160f1e
Delete zipcode-extensions.png
zxyanliu Jan 30, 2020
dc7a2b4
Add files via upload
zxyanliu Jan 30, 2020
5f56030
Update tutorial-get-weather.md
zxyanliu Jan 30, 2020
e62a0f0
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
b55439d
Update tutorial-get-weather.md
zxyanliu Jan 30, 2020
8724ebe
update-tutorial-add-help
zxyanliu Jan 30, 2020
aa652e6
Update tutorial-add-help.md
zxyanliu Jan 30, 2020
376f9ee
Update tutorial-lg.md
zxyanliu Jan 30, 2020
f7d691c
Update-tutorial-lg
zxyanliu Jan 30, 2020
b3e1645
Update tutorial-cards.md
zxyanliu Jan 30, 2020
eadf8fe
Update-tutorial-cards
zxyanliu Jan 30, 2020
3a3bb4a
Update tutorial-luis.md
zxyanliu Jan 30, 2020
9671b02
Update luis-key.png
zxyanliu Jan 30, 2020
820302b
Update tutorial-luis.md
zxyanliu Jan 30, 2020
2cff0e9
Update tutorial-get-weather.md
zxyanliu Jan 30, 2020
e917fd7
Update-concept-dialog
zxyanliu Jan 30, 2020
90b26b1
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
ae24434
Update concept-dialog.md
zxyanliu Jan 30, 2020
c0e307e
Update-events-triggers
zxyanliu Jan 30, 2020
d868958
Delete concept-events-and-triggers.md
zxyanliu Jan 30, 2020
5f0eebe
Create concept-events-and-triggers.md
zxyanliu Jan 30, 2020
644b083
Update concept-events-and-triggers.md
zxyanliu Jan 30, 2020
228b6a9
Update concept-events-and-triggers.md
zxyanliu Jan 30, 2020
aca5e92
Update how-to-define-triggers.md
zxyanliu Jan 30, 2020
69ab52e
Update concept-memory.md
zxyanliu Jan 30, 2020
d166c25
Update concept-language-generation.md
zxyanliu Jan 30, 2020
fe407df
Update concept-language-understanding.md
zxyanliu Jan 30, 2020
d7a5578
Update-langauge-understanding
zxyanliu Jan 30, 2020
dc7f7d8
Update concept-language-understanding.md
zxyanliu Jan 30, 2020
9c4b28b
Update concept-language-understanding.md
zxyanliu Jan 30, 2020
cb7f8e9
Update concept-language-understanding.md
zxyanliu Jan 30, 2020
079eff0
Merge branch 'kaiqb/composer-review' of https://github.com/microsoft/…
zxyanliu Jan 30, 2020
7284810
Update concept-language-understanding.md
zxyanliu Jan 30, 2020
93e00fe
Update how-to-send-cards.md
zxyanliu Jan 30, 2020
b27f996
Merge branch 'master' into kaiqb/composer-review
a-b-r-o-w-n Jan 30, 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
106 changes: 25 additions & 81 deletions docs/concept-dialog.md

Large diffs are not rendered by default.

124 changes: 74 additions & 50 deletions docs/concept-events-and-triggers.md

Large diffs are not rendered by default.

137 changes: 66 additions & 71 deletions docs/concept-language-generation.md

Large diffs are not rendered by default.

196 changes: 81 additions & 115 deletions docs/concept-language-understanding.md

Large diffs are not rendered by default.

155 changes: 87 additions & 68 deletions docs/concept-memory.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions docs/how-to-ask-for-user-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ As seen in the **TextInput** dialog the user is prompted for their name in the *

![Text prompt bot says](./media/ask-for-input/text-bot-asks.png)

The user's response is stored in **Property to fill** in the **User Asks** section as `user.name`. Note that you can change the **Output Format** if you want to save the text as trimmed (leading and trailing whitespace removed), uppercase, or lowercase.
The user's response is stored in **Property to fill** in the **User Input** section as `user.name`. Note that you can change the **Output Format** if you want to save the text as trimmed (leading and trailing whitespace removed), uppercase, or lowercase.

![Text prompt user input](./media/ask-for-input/text-user-input.png)

Expand Down Expand Up @@ -51,7 +51,9 @@ In the **ChoiceInput** dialog you will see the **Property to fill** is set to `u
| Suggested Action | ![list suggested action](./media/ask-for-input/multichoice-list-suggestedactions.png) | displays options as Suggested Action buttons |
| Hero Card | ![list hero card](./media/ask-for-input/multichoice-list-herocard.png) | displays Hero Card with options as buttons **within** card |

In the **User Answers** section in the Property panel you will also notice **Choice Options**, which can be used to add more choices and their synonyms. You'll also see three boxes related to inline separation, or how your bot separates the text of your choices:
In the **User Input** section in the properties panel you will notice **Choice Options**, which can be used to add more choices and their synonyms. You can set the choice options in **Static** or **Dynamic** format. For **Static** format, you need to write each choice option manually; for **Dynamic** format, you can set the options to an array and then retrieve the value dynamically.

You'll also see three boxes related to inline separation, or how your bot separates the text of your choices:
- **Inline separator** - character used to separate individual choices when there are more than two choices, usually `,`.
- **Inline or** - separator used when there are only two choices, usually `or`.
- **Inline or more** - separator between last two choices when there are more than two options, usually `, or`.
Expand Down
199 changes: 112 additions & 87 deletions docs/how-to-define-triggers.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/how-to-publish-bot.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To publish a bot, you will need to use Az CLI tool and Bot Framework LuBuild too
- A subscription to [Microsoft Azure](https://azure.microsoft.com/en-us/free/)
- To install **Az CLI**, follow [Install the Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest) instructions
- To install **PowerShell 6.0**, follow [Install PowerShell 6.0](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-6) instructions
- To install **LuBuild**, run the following command
- To install **[LuBuild](https://botbuilder.myget.org/feed/botbuilder-declarative/package/npm/lubuild)**, run the following command
```
npm install -g https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz
```
Expand Down
8 changes: 4 additions & 4 deletions docs/how-to-send-cards.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sending responses with cards
A bot communicates with users through message activities which are multi-modal. There are messages which simply consist of plain text and there are also richer message content such as cards. Bot Framework Composer supports [structured response template](https://github.com/microsoft/BotBuilder-Samples/blob/vishwac/master-4.6/experimental/language-generation/docs/structured-response-template.md) with which you can add rich cards to your bot and enhance your bot's design. If you are looking for examples about sending text messages to users please read the [sending messages to users](./how-to-send-messages.md) article.
A bot communicates with users through message activities which are multi-modal. There are messages which simply consist of plain text and there are also richer message content such as cards. Bot Framework Composer supports [structured response template](https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/language-generation/docs/structured-response-template.md) with which you can add rich cards to your bot and enhance your bot's design. If you are looking for examples about sending text messages to users please read the [sending messages to users](./how-to-send-messages.md) article.

In this article, we will cover different types of cards you can define in Composer using [structured response template](https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/language-generation/docs/structured-response-template.md). We use the examples provided in the [RespondingWithCardsSample](https://github.com/microsoft/BotFramework-Composer/tree/master/Composer/packages/server/assets/projects/RespondingWithCardsSample) throughout this article.

Expand Down Expand Up @@ -141,12 +141,12 @@ This template "#AllCards" is defined to display all cards when the template is c

## References
- [Bot Framework - Cards](https://github.com/microsoft/botframework-sdk/blob/master/specs/botframework-activity/botframework-cards.md)
- [Add media to messages](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-add-media-attachments?view=azure-bot-service-4.0&tabs=csharp)
- [Add media to messages](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-add-media-attachments)
- [Language Generation](./concept-language-generation.md)
- [Structured response template](https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/language-generation/docs/structured-response-template.md)
- [Adaptive Cards overview](https://docs.microsoft.com/en-us/adaptive-cards/)
- [Adaptive Cards overview](https://docs.microsoft.com/adaptive-cards/)
- [Adaptive Cards Sample](https://github.com/microsoft/BotBuilder-Samples/tree/master/samples/csharp_dotnetcore/07.using-adaptive-cards)
- [Adaptive Cards for bot developers](https://docs.microsoft.com/en-us/adaptive-cards/getting-started/bots)
- [Adaptive Cards for bot developers](https://docs.microsoft.com/adaptive-cards/getting-started/bots)

## Next
- Learn [how to define triggers and events](./how-to-define-triggers.md).
Expand Down
10 changes: 5 additions & 5 deletions docs/how-to-send-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ To define a simple text message, use a "-" before the text that you want your bo

You can also define a simple text message with multiple variations. Bot will respond with any of the simple text messages by random. For example:

> Greeting template with 2 variations.
# GreetingPrefix
- Hi
- Hello
# SimpleText
- Hi, this is simple text
- Hey, this is simple text
- Hello, this is simple text

### Text with memory
To define a text message with memory, you need to **Set a Property** first and then use an expression response like this:
Expand Down Expand Up @@ -127,7 +127,7 @@ Similar to If/Else conditional template, you can define a Switch conditional tem
In this Switch conditional template, bot will respond in text message `Happy Sunday!`, `Happy Saturday` or `Working day!` based on the returned value of days of the week for a given timestamp. `utcNow()`is a pre-built function which returns current timestamp as string. `dayOfWeek()` is a pre-built function which returns the day of the week from a timestamp. Read more about [pre-built functions](https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/common-expression-language/prebuilt-functions.md) in [common expression language](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/common-expression-language).

## References
- [Send and receive text message](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-send-messages?view=azure-bot-service-4.0)
- [Send and receive text message](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-send-messages)
- [Language generation](./concept-language-generation.md)
- [.lg file format](https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/language-generation/docs/lg-file-format.md)
- [Common language expression](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/common-expression-language#readme)
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-use-LUIS.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ To test your bot which you just added LUIS to, click the **Test in Emulator** bu

## References
- [LUIS.ai](https://www.luis.ai/home)
- [Add natural language understanding to your bot](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-v4-luis?view=azure-bot-service-4.0&tabs=csharp)
- [Add natural language understanding to your bot](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-v4-luis)
- [Events and triggers](./concept-events-and-triggers.md)
- [Language Understanding](./concept-language-understanding.md)

Expand Down
65 changes: 65 additions & 0 deletions docs/introduction.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Introduction to the Bot Framework Composer

The Bot Framework Composer is an integrated development tool that developers and multi-disciplinary teams can use to build bots. It is built using the latest features of the Bot Framework SDK. Within Composer, you'll find everything you need to build a sophisticated conversational experience:

* A visual dialog editor.
* Tools to train and manage Language Understanding (LU).
* Powerful language generation and templating systems.
* A ready-to-use bot runtime executable .

![BF Composer](./media/introduction/composer-overview.png)

Under the hood, Composer harnesses the power of many of the components from the Bot Framework SDK. When building bots in Composer, developers will have access to:

**Adaptive dialogs**

Dialogs provide a way for the bot to manage conversations with the user. The new [Adaptive dialog](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/adaptive-dialog) and the event model simplify sophisticated conversation modelling and helps you focus on the model of the conversation rather than the mechanics of dialog management.

**Language Understanding (LU)**

LU is a core component of Composer, allowing developers and conversation designers to train language understanding directly in the context of editing a dialog. As dialogs are edited in Composer, developers can continuously add to their bots' natural language capabilities using the [lu file format](https://aka.ms/lu-file-format), a simple markdown-like format that makes it easy to define new [intents](concept-language-understanding.md#intents) and provide sample [utterances](concept-language-understanding.md#utterances). In Composer, you can use both regular expression or [LUIS](https://docs.microsoft.com/azure/cognitive-services/luis/what-is-luis) service.

![BF Composer NLU](./media/introduction/intro-nlu.png)

Composer detects changes and updates the bot's cloud-based natural-language understanding (NLU) model automatically so it is always up to date.

**Language Generation (LG)**

Creating grammatically correct, data-driven responses that have a consistent tone and convey a clear brand voice has always been a challenge for bot developers. Composer's integrated [Language Generation](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/language-generation) system allows developers to create bot replies with a great deal of flexibility.

![BF Composer LG](./media/introduction/Bot-Responses.png)

With Language Generation, previously complex tasks can be quickly achieved, like:
* Including dynamic elements in messages.
* Generating grammatically correct lists, pronouns, articles.
* Providing context-sensitive variation in messages.
* Creating Adaptive Cards attachments, as seen above.

**QnA Maker**

[QnA Maker](https://docs.microsoft.com/azure/cognitive-services/qnamaker/overview/overview) is a cloud-based Natural Language Processing (NLP) service that easily creates a natural conversational layer over your data. It can be used to find the most appropriate answer for any given natural language input, from your custom knowledge base (KB) of information.

**Bot Framework Emulator**

[Emulator](https://github.com/Microsoft/BotFramework-Emulator/blob/master/README.md) is a desktop application that allows bot developers to test and debug bots built using Composer.


## Advantage of developing bots with Composer
Developers familiar with the Bot Framework SDK will notice differences between bots developed with it and the Bot Framework Composer. Some of the advantages of developing bots in Composer include:
- Use of Adaptive Dialogs allow for Language Generation (LG), which can simplify interruption handling and give bots character.
- Visual design surface in Composer eliminates the need for boilerplate code and makes bot development more accessible. You no longer need to navigate between experiences to maintain LU model as it is editable within the app.
- Time saved with fewer steps to set up your environment.

A major difference between the current version of the Bot Framework SDK and Composer is that the apps created using Composer uses the Adaptive dialog format, a JSON specification shared by many tools provided by the Bot Framework. More information about Adaptive dialog is available on [GitHub](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/adaptive-dialog).

<!--Composer assets such as Dialogs, Language Understanding (LU) training data, and message templates can be managed like any other developer asset. They are files that can be committed to source control and deployed with code updates.-->

The Composer bot projects contain reusable assets in the form of JSON and Markdown files that can be bundled and packaged with a bot's source code. These can be checked into source control systems and deployed along with code updates, such as dialogs, language understanding (LU) training data, and message templates.

## Additional resources
- [Bot Framework SDK](https://github.com/microsoft/botframework-sdk/blob/master/README.md)
- [Common Expression Language](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/common-expression-language)

## Next steps

* Learn how to [create an echo bot](./quickstart-create-bot.md) using Composer.
Binary file modified docs/media/ask-for-input/choice-and-inline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/dialog/action-menu.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/media/dialog/action_menu.gif
Binary file not shown.
Binary file modified docs/media/dialog/adaptive-dialog-anatomy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/media/dialog/begin_dialog_action.png
Binary file not shown.
Binary file removed docs/media/dialog/create_new_bot.png
Binary file not shown.
Binary file added docs/media/dialog/main-and-child-dialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/media/dialog/main_child_dialog.png
Binary file not shown.
Binary file removed docs/media/dialog/main_dialog.png
Binary file not shown.
Binary file removed docs/media/dialog/new_bot.png
Binary file not shown.
Binary file removed docs/media/dialog/new_weather_dialog.png
Binary file not shown.
Binary file modified docs/media/dialog/recognizer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/media/dialog/send_response.gif
Binary file not shown.
Binary file removed docs/media/dialog/test_emulator.png
Binary file not shown.
Binary file added docs/media/dialog/trigger-menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/media/dialog/trigger_menu.gif
Binary file not shown.
Binary file removed docs/media/dialog/weather_dialog.png
Binary file not shown.
Binary file removed docs/media/dialog/wire_up_dialog.gif
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/events-triggers/LUIS-intent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/events-triggers/activities.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/events-triggers/begin-dialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/events-triggers/cancel-trigger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/events-triggers/dialog-events.png
Binary file added docs/media/events-triggers/intent-trigger.png
Binary file added docs/media/events-triggers/regex-recognizer.png
Binary file added docs/media/events-triggers/score.png
Binary file added docs/media/events-triggers/trigger-menu.gif
Binary file added docs/media/events-triggers/unknown-intent.png
Binary file added docs/media/events-triggers/welcome.gif
Binary file added docs/media/events-triggers/wire-up-dialog.gif
Diff not rendered.
Binary file removed docs/media/events_triggers/LUIS_intent.png
Diff not rendered.
Binary file removed docs/media/events_triggers/activities.png
Diff not rendered.
Binary file removed docs/media/events_triggers/activity_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/anatomy_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/author_LUIS_intent.gif
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/begin_dialog.png
Diff not rendered.
Binary file removed docs/media/events_triggers/cancel_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/configure_dialog.png
Diff not rendered.
Binary file removed docs/media/events_triggers/configure_trigger.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/custom_event.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/custom_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/define_intents.png
Diff not rendered.
Binary file removed docs/media/events_triggers/dialog_events.png
Diff not rendered.
Binary file removed docs/media/events_triggers/dialog_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/emit_custom_event.gif
Diff not rendered.
Binary file removed docs/media/events_triggers/emit_custom_event.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/greeting_trigger.gif
Diff not rendered.
Binary file removed docs/media/events_triggers/intent_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/luis_recognizer.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/new_trigger.png
Diff not rendered.
Binary file removed docs/media/events_triggers/recognizer_type.png
Diff not rendered.
Binary file removed docs/media/events_triggers/regex_recognizer.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/score.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/trigger_menu.png
Diff not rendered.
Binary file removed docs/media/events_triggers/unknown_intent.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/events_triggers/welcome.gif
Diff not rendered.
Binary file added docs/media/introduction/Bot-Responses.png
Binary file modified docs/media/introduction/composer-overview.png
Binary file modified docs/media/introduction/intro-nlu.png
Binary file removed docs/media/language_generation/bot_responses.png
Diff not rendered.
Binary file removed docs/media/language_generation/bot_says.png
Diff not rendered.
Binary file removed docs/media/language_generation/inline_editor.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/language_understanding/all_up_view.png
Diff not rendered.
Binary file removed docs/media/language_understanding/intents.gif
Diff not rendered.
Binary file removed docs/media/language_understanding/luis.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/language_understanding/user_say.png
Diff not rendered.
Diff not rendered.
Binary file added docs/media/memory/delete-properties.png
Binary file modified docs/media/memory/memory-mainpulation-menu.png
Binary file added docs/media/memory/set-properties.png
Binary file modified docs/media/setup-yarn/address.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/01/create-1.png
Binary file modified docs/media/tutorial-weatherbot/01/create-2.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/01/empty-main-dialog.png
Binary file modified docs/media/tutorial-weatherbot/01/emulator-launch.png
Diff not rendered.
Binary file removed docs/media/tutorial-weatherbot/01/new-flow.png
Diff not rendered.
Binary file added docs/media/tutorial-weatherbot/01/new.png
Diff not rendered.
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/01/start-bot.gif
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/tutorial-weatherbot/02/select-begin.gif
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/media/tutorial-weatherbot/03/empty-prompt.png
Diff not rendered.
Binary file removed docs/media/tutorial-weatherbot/03/http-props.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/03/http-step.png
Binary file added docs/media/tutorial-weatherbot/03/http-url.png
Binary file modified docs/media/tutorial-weatherbot/03/ifelse.png
Binary file modified docs/media/tutorial-weatherbot/03/ifelse2.png
Binary file removed docs/media/tutorial-weatherbot/03/prompt-tabs.png
Diff not rendered.
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/03/zipcode-answer.png
Binary file modified docs/media/tutorial-weatherbot/03/zipcode-extensions.png
Binary file removed docs/media/tutorial-weatherbot/03/zipcode-flow.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/04/begin-new-dialog.png
Binary file modified docs/media/tutorial-weatherbot/04/cancel-flow.png
Binary file modified docs/media/tutorial-weatherbot/04/cancel-trigger.png
Binary file modified docs/media/tutorial-weatherbot/04/help-dialog.png
Binary file modified docs/media/tutorial-weatherbot/04/help-intent.png
Binary file removed docs/media/tutorial-weatherbot/04/help-props.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/04/help.png
Binary file modified docs/media/tutorial-weatherbot/04/intent-trigger-help.png
Binary file modified docs/media/tutorial-weatherbot/04/interrupts.png
Binary file modified docs/media/tutorial-weatherbot/04/new_trigger.png
Binary file modified docs/media/tutorial-weatherbot/05/botsays.png
Binary file modified docs/media/tutorial-weatherbot/05/editmode.png
Binary file modified docs/media/tutorial-weatherbot/05/lg-2.png
Binary file modified docs/media/tutorial-weatherbot/05/nav1.png
Binary file removed docs/media/tutorial-weatherbot/05/nav2.png
Diff not rendered.
Binary file modified docs/media/tutorial-weatherbot/05/nice-weather.png
Binary file modified docs/media/tutorial-weatherbot/06/getWeather-beginDialog.png
Binary file modified docs/media/tutorial-weatherbot/06/weather-card.png
Binary file modified docs/media/tutorial-weatherbot/06/zipcode-prompt.png
Binary file modified docs/media/tutorial-weatherbot/07/back-at-zipcode-prompt.png
Binary file modified docs/media/tutorial-weatherbot/07/luis-key.png
Binary file modified docs/media/tutorial-weatherbot/07/luis-score.png
Binary file modified docs/media/tutorial-weatherbot/07/luis-wired-up.png
Binary file modified docs/media/tutorial-weatherbot/07/set-property-zipcode.png
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ After opening Composer in a browser click the **Echo Bot** button at the top of
You've successfully created an echo bot!

## Next Steps
Create a [weather bot](tutorial/bot-tutorial-introduction.md) using Composer.
Create a [weather bot](tutorial/tutorial-introduction.md) using Composer.

61 changes: 36 additions & 25 deletions docs/setup-yarn.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,43 @@ Bot Framework Composer is designed to be a hosted web app. Currently, you need t
- [Bot Framework Emulator](https://github.com/microsoft/BotFramework-Emulator/releases/latest): latest stable version
- [.NET Core SDK 2.2](https://dotnet.microsoft.com/download/dotnet-core/2.2): required to test your bot

## Set up yarn for Composer
To start, clone the Composer GitHub repository.
```
git clone https://github.com/microsoft/BotFramework-Composer.git
```

After cloning the repo open a terminal and navigate to the Bot Framework Composer folder. Navigate to the **Composer** folder and run the following commands:
```
cd Composer
yarn
```
This command gets all dependent packages.

```
yarn build
```
This command builds the Composer app. The build process can take few minutes.
## Installation instructions
1. To start, open a terminal and clone the Composer GitHub repository. You will use this terminal for the rest of the steps in this section.

```
git clone https://github.com/microsoft/BotFramework-Composer.git
```

2. After cloning the repository, navigate to the **Bot Framework Composer** folder. Then run the following commands to navigate to the **Composer** folder and get all required packages:

```
cd Composer
yarn
```

3. Next, run the following command to build the Composer application, this command can take several minutes to finish:

```
yarn build
```

If you are having trouble intalling or building Composer run `yarn tableflip`, which removes all of the Composer application's dependencies (node_modules) and reinstalls and rebuilds the application's dependencies. After running `yarn tableflip` run `yarn install` and `yarn build` again. This process can take anywhere from 5-10 minutes.
> [!NOTE]
> If you are having trouble installing or building Composer run `yarn tableflip`. This will remove all of the Composer application's dependencies (node_modules) and then it reinstalls and rebuilds all of its dependencies. Once completed, run `yarn install` and `yarn build` again. This process generally takes 5-10 minutes.

4. Again using Yarn, start the Composer authoring application and the bot runtime:

```
yarn startall
```

5. Once you see **Composer now running at:** appear in your terminal, you can run Composer in your browser using the address http://localhost:3000.

![browser address](./media/setup-yarn/address.png)

Keep the terminal open as long as you plan to work with the Composer. If you close it, Composer will stop running.

```
yarn startall
```
This command starts the Composer authoring application and the bot runtime.
The next time you need to run the Composer, all you will need is to run `yarn startall` from the **Composer** directory.

## Open Composer in a browser
To use Composer open a browser and navigate to the address after the message `Compiled successfully`, as seen below where the address is http://localhost:3000.
## Next steps

![browser address](./media/setup-yarn/address.png)
- Create a [echo bot](./quickstart-create-bot.md) using Composer.
Loading