fix: merge with main again #5050
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
…osoft#5020) * Updated installOneAuth script to target correct version. * Better refactor
* expressions menu * Fixing aligment of menu * PR comments Co-authored-by: Soroush <hatpick@gmail.com>
* fix * Improved handling of focus when leveraging an Intellisense suggestion * comments on wrong lines
* refactor the luis build in azure publish * update the orchestrator path * update the cleanup * fix typo * catch the build error * remove qna endpoint * remove console * add qnaconfig
boydc2014
approved these changes
Dec 2, 2020
benbrown
pushed a commit
to benbrown/BotFramework-Composer
that referenced
this pull request
May 24, 2021
* try-catch around trigger grouping expressions (microsoft#5017) Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> * chore: Updated installOneAuth script to target correct version. (microsoft#5020) * Updated installOneAuth script to target correct version. * Better refactor * feat: adaptive expression functions menu (microsoft#5015) * expressions menu * Fixing aligment of menu * PR comments Co-authored-by: Soroush <hatpick@gmail.com> * fix: Correct handling of focus for Intellisense fields (microsoft#5039) * fix * Improved handling of focus when leveraging an Intellisense suggestion * comments on wrong lines * feat: azure publish with orchestrator (microsoft#5011) * refactor the luis build in azure publish * update the orchestrator path * update the cleanup * fix typo * catch the build error * remove qna endpoint * remove console * add qnaconfig Co-authored-by: Geoff Cox (Microsoft) <gcox@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Tony Anziano <tonyanziano5@gmail.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: leileizhang <leilzh@microsoft.com>
benbrown
pushed a commit
that referenced
this pull request
Jun 11, 2021
* try-catch around trigger grouping expressions (#5017) Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> * chore: Updated installOneAuth script to target correct version. (#5020) * Updated installOneAuth script to target correct version. * Better refactor * feat: adaptive expression functions menu (#5015) * expressions menu * Fixing aligment of menu * PR comments Co-authored-by: Soroush <hatpick@gmail.com> * fix: Correct handling of focus for Intellisense fields (#5039) * fix * Improved handling of focus when leveraging an Intellisense suggestion * comments on wrong lines * feat: azure publish with orchestrator (#5011) * refactor the luis build in azure publish * update the orchestrator path * update the cleanup * fix typo * catch the build error * remove qna endpoint * remove console * add qnaconfig Co-authored-by: Geoff Cox (Microsoft) <gcox@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Tony Anziano <tonyanziano5@gmail.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: leileizhang <leilzh@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pr it to solve conflict.
Task Item
#minor