chore: merge latest master into multibot branch #3518
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
* ctrl + click behavior * enhance the focus behavior * range selection e2e * calculate accurate range selection * MacOS Meta + Click support Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* fix runtime relative path in eject * fix process pid not exist when runtime folder not exist Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* Fix a typo Message recieved -> Message received * Improve language A basic brush of the Home page.
* fix get history before file persistence * flush in action not in component * fix bug Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Dong Lei <donglei@microsoft.com>
… your input (#3427) * bug fix * pr comment * lint * double export * updated test Co-authored-by: Louis Eugene <leugene@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* revert commit about add plugins into workspace * revert other relative path change * update the lock file * remove yarn.lock in azure plugins to make sure bot-deploy updated Co-authored-by: leilzh <leilzh@microsoft.com> Co-authored-by: Andy Brown <asbrown002@gmail.com>
* issues#3309 * fixes lints * Default to bot settings if no route cache * fix: #3485 Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* add rule and remove dangling underscores * update elliptic and test Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
fix: #3486 Debug/Fix HMR support
* add logo-clicking to tests * bump elliptic version * Update yarn.lock Co-authored-by: Andy Brown <asbrown002@gmail.com>
* fix: support validate lg custom functions and separate the dialog validation from parser * use file name as namespace * add unit test * fix lint
beyackle
requested review from
a-b-r-o-w-n,
benbrown,
boydc2014,
carlosscastro,
cwhitten,
luhan2017,
srinaath and
tonyanziano
as code owners
* upgrade lu packages * update package * clean * update * clean up Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
benbrown
pushed a commit
to benbrown/BotFramework-Composer
that referenced
this pull request
May 24, 2021
* link the application keys with bot service in provision script (microsoft#3425) * fix: microsoft#3309 Allow configuring app settings without opening a bot project (microsoft#3454) * issues#3309 * fixes lints * Default to bot settings if no route cache Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * feat: 'Ctrl + Click', 'Shift + Click' behaviors in Flow Editor (microsoft#3448) * ctrl + click behavior * enhance the focus behavior * range selection e2e * calculate accurate range selection * MacOS Meta + Click support Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: fix relative path of runtime folder in eject customized (microsoft#3434) * fix runtime relative path in eject * fix process pid not exist when runtime folder not exist Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: typo (microsoft#3474) * Fix a typo Message recieved -> Message received * Improve language A basic brush of the Home page. * fix: fix get history before file persistence (microsoft#3440) * fix get history before file persistence * flush in action not in component * fix bug Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Dong Lei <donglei@microsoft.com> * fix: microsoft#2692 Tabbing / clicking / returning out of a number field round your input (microsoft#3427) * bug fix * pr comment * lint * double export * updated test Co-authored-by: Louis Eugene <leugene@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: revert plugins out of workspace (microsoft#3479) * revert commit about add plugins into workspace * revert other relative path change * update the lock file * remove yarn.lock in azure plugins to make sure bot-deploy updated Co-authored-by: leilzh <leilzh@microsoft.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> * chore: Hide ignored folders in vscode, update prettier config (microsoft#3493) * issues#3309 * fixes lints * Default to bot settings if no route cache * fix: microsoft#3485 Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * feat: show 'AutoEndDialog' from Adaptive Dialog Property Editor (microsoft#3498) * refactor: add rule and remove dangling underscores (microsoft#3496) * add rule and remove dangling underscores * update elliptic and test Co-authored-by: Andy Brown <asbrown002@gmail.com> * chore: added config to debug Electron main process. (microsoft#3501) Co-authored-by: Andy Brown <asbrown002@gmail.com> * Merge pull request microsoft#3502 from hatpick/master fix: microsoft#3486 Debug/Fix HMR support * fix: add logo-clicking to tests (microsoft#3500) * add logo-clicking to tests * bump elliptic version * Update yarn.lock Co-authored-by: Andy Brown <asbrown002@gmail.com> * feat: support validate lg custom functions (microsoft#3273) * fix: support validate lg custom functions and separate the dialog validation from parser * use file name as namespace * add unit test * fix lint * fix: inline editing LU mess up whole file (microsoft#3478) * upgrade lu packages * update package * clean * update * clean up Co-authored-by: Andy Brown <asbrown002@gmail.com> * refactor: change term primary key to authoring key (microsoft#3516) Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Qi Kang <kangqidev@gmail.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: zeye <2295905420@qq.com> Co-authored-by: VanyLaw <wenyluo@microsoft.com> Co-authored-by: Yan Liu <32497439+zxyanliu@users.noreply.github.com> Co-authored-by: Dong Lei <donglei@microsoft.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com> Co-authored-by: Louis Eugene <leugene@microsoft.com> Co-authored-by: leilzh <leilzh@microsoft.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: TJ Durnford <tjdford@gmail.com> Co-authored-by: Tony Anziano <toanzian@microsoft.com> Co-authored-by: Zhixiang Zhan <zhixzhan@microsoft.com> Co-authored-by: liweitian <liweitian93@outlook.com>
benbrown
pushed a commit
that referenced
this pull request
Jun 11, 2021
* link the application keys with bot service in provision script (#3425) * fix: #3309 Allow configuring app settings without opening a bot project (#3454) * issues#3309 * fixes lints * Default to bot settings if no route cache Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * feat: 'Ctrl + Click', 'Shift + Click' behaviors in Flow Editor (#3448) * ctrl + click behavior * enhance the focus behavior * range selection e2e * calculate accurate range selection * MacOS Meta + Click support Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: fix relative path of runtime folder in eject customized (#3434) * fix runtime relative path in eject * fix process pid not exist when runtime folder not exist Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: typo (#3474) * Fix a typo Message recieved -> Message received * Improve language A basic brush of the Home page. * fix: fix get history before file persistence (#3440) * fix get history before file persistence * flush in action not in component * fix bug Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Dong Lei <donglei@microsoft.com> * fix: #2692 Tabbing / clicking / returning out of a number field round your input (#3427) * bug fix * pr comment * lint * double export * updated test Co-authored-by: Louis Eugene <leugene@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * fix: revert plugins out of workspace (#3479) * revert commit about add plugins into workspace * revert other relative path change * update the lock file * remove yarn.lock in azure plugins to make sure bot-deploy updated Co-authored-by: leilzh <leilzh@microsoft.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> * chore: Hide ignored folders in vscode, update prettier config (#3493) * issues#3309 * fixes lints * Default to bot settings if no route cache * fix: #3485 Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * feat: show 'AutoEndDialog' from Adaptive Dialog Property Editor (#3498) * refactor: add rule and remove dangling underscores (#3496) * add rule and remove dangling underscores * update elliptic and test Co-authored-by: Andy Brown <asbrown002@gmail.com> * chore: added config to debug Electron main process. (#3501) Co-authored-by: Andy Brown <asbrown002@gmail.com> * Merge pull request #3502 from hatpick/master fix: #3486 Debug/Fix HMR support * fix: add logo-clicking to tests (#3500) * add logo-clicking to tests * bump elliptic version * Update yarn.lock Co-authored-by: Andy Brown <asbrown002@gmail.com> * feat: support validate lg custom functions (#3273) * fix: support validate lg custom functions and separate the dialog validation from parser * use file name as namespace * add unit test * fix lint * fix: inline editing LU mess up whole file (#3478) * upgrade lu packages * update package * clean * update * clean up Co-authored-by: Andy Brown <asbrown002@gmail.com> * refactor: change term primary key to authoring key (#3516) Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Qi Kang <kangqidev@gmail.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: zeye <2295905420@qq.com> Co-authored-by: VanyLaw <wenyluo@microsoft.com> Co-authored-by: Yan Liu <32497439+zxyanliu@users.noreply.github.com> Co-authored-by: Dong Lei <donglei@microsoft.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com> Co-authored-by: Louis Eugene <leugene@microsoft.com> Co-authored-by: leilzh <leilzh@microsoft.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: TJ Durnford <tjdford@gmail.com> Co-authored-by: Tony Anziano <toanzian@microsoft.com> Co-authored-by: Zhixiang Zhan <zhixzhan@microsoft.com> Co-authored-by: liweitian <liweitian93@outlook.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
Merge a week's worth of changes from master into the multibot branch.
Task Item
#minor