Skip to content

Conversation

@gabog
Copy link
Contributor

@gabog gabog commented Mar 12, 2020

(cherry picked from commit 3730963)

* Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).
* Applied URI prefix to caller ID as per OBI spec
https://github.com/microsoft/botframework-obi/blob/master/protocols/botframework-activity/botframework-activity.md#bot-calling-skill

(cherry picked from commit 3730963)
@gabog gabog requested a review from stevengum March 12, 2020 04:53
@stevengum stevengum merged commit 0591aec into 4.8 Mar 12, 2020
@stevengum stevengum deleted the cherry-pick/3540 branch March 12, 2020 04:56
@gabog gabog restored the cherry-pick/3540 branch March 12, 2020 04:56
@gabog gabog deleted the cherry-pick/3540 branch March 12, 2020 04:56
garypretty added a commit that referenced this pull request Apr 16, 2020
* Fix AdaptiveTesting to have correct preview labels

* Proactive auth: trust incoming token url conditionally (#3533)

* Add unit test for CancelAllDialogs and fix eventName and eventValue could be null (#3536)

* fix lack of a generic typed method for posting activities to skills (#3539) (#3542)

* fix lack of a generic typed method for posting activities to skills

* remove duplicated code

Co-authored-by: Swagat Mishra <swagatm@microsoft.com>

Co-authored-by: swagat mishra <swagatmishra2007@gmail.com>
Co-authored-by: Swagat Mishra <swagatm@microsoft.com>

* EoC should only be handled when coming from parent in RunAsync (#3540) (#3543)

* Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).
* Applied URI prefix to caller ID as per OBI spec
https://github.com/microsoft/botframework-obi/blob/master/protocols/botframework-activity/botframework-activity.md#bot-calling-skill

(cherry picked from commit 3730963)

* Merge pull request #3564 from microsoft/tedlee/fix-oauth-credentials (#3571)

[OAuth]do not set signInLink to empty when OAuthAppCredentials is set

* Address QnAMaker / recognizer telemetry across dialogs / adaptive

* Fixes following merge from master

* Added comments to the TrackRecognizerResult method on the Recognizer class.

* More comments.

Co-authored-by: Tom Laird-McConnell <tomlm@microsoft.com>
Co-authored-by: Carlos Castro <carlosscastro@users.noreply.github.com>
Co-authored-by: Steven Gum <14935595+stevengum@users.noreply.github.com>
Co-authored-by: swagat mishra <swagatmishra2007@gmail.com>
Co-authored-by: Swagat Mishra <swagatm@microsoft.com>
Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants