This repository was archived by the owner on Jul 9, 2025. It is now read-only.
chore: rebase main onto bot-projects feature branch #4780
Merged
Conversation
This file contains hidden or 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
* Added languages to dropdown in settings * Fixed typo in zh-Hant key * Moved englishName to comments * log over error to allow tests to run
Setting `mainFields` to ['main'] forces webpack to only resolve a package's main module, bypassing loading it's `module`.
Co-authored-by: Composer Localization <[email protected]> Co-authored-by: Chris Whitten <[email protected]>
* Added ability to parse "import" deeplinks * Server-side changes for import * Client changes for import * Added checkForPVASchema util * Token caching fix and bad import fix * Various refactors * Linting fixes * Client side refactors and PR comments * Server side PR comments and linting * Fix schema tests * Fixed bot project controller tests * Removed unused import * Added logic to auth against the correct PVA environment on import Co-authored-by: Chris Whitten <[email protected]>
* Client pull changes * Server-side pull changes * Lint fixes. * Refactors * Server side refactors * Removed unused imports
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Dong Lei <[email protected]> Co-authored-by: Lu Han <[email protected]> Co-authored-by: Chris Whitten <[email protected]> Co-authored-by: Gabo Gilabert <[email protected]>
…oser into chore/rebase-main Signed-off-by: Srinaath Ravichandran <[email protected]> # Conflicts: # Composer/packages/client/src/components/TestController/TestController.tsx # Composer/packages/client/src/utils/hooks.ts # Composer/packages/client/src/utils/pageLinks.ts
Signed-off-by: Srinaath Ravichandran <[email protected]>
srinaath
requested review from
GeoffCoxMSFT,
a-b-r-o-w-n,
beyackle,
boydc2014,
cwhitten,
hatpick and
tonyanziano
as code owners
…oser into chore/rebase-main
srinaath
requested review from
benbrown,
carlosscastro and
luhan2017
as code owners
srinaath
changed the title
added 2 commits
November 11, 2020 20:07
Signed-off-by: Srinaath Ravichandran <[email protected]>
Signed-off-by: Srinaath Ravichandran <[email protected]>
alanlong9278
added a commit
to alanlong9278/BotFramework-Composer
that referenced
this pull request
Nov 16, 2020
* settingsPage: (22 commits) Refactoring function calls fix: remove special case for single-bot view in tree (microsoft#4803) fix bug fix UT code refine Removed other languages for now. (microsoft#4789) Made the default width for the property editor wider (microsoft#4788) pass csrf token to plugin hosts (microsoft#4787) Updated disability styles chore: rebase main onto bot-projects feature branch (microsoft#4780) fix: zip file can not be deleted (microsoft#4760) Remove enforce auto end dialog for skill bots (microsoft#4440) Several PVA integration improvements / bug fixes (microsoft#4776) Updated strings from building (microsoft#4762) feat: Implement pull from publish target (microsoft#4768) fix: Allowed 404 to fall through axios during import flow (microsoft#4770) increase unit tests timeout to 30 min (microsoft#4764) feat: Allow importing bot content from an external source (microsoft#4751) Localized resource files from OneLocBuild (microsoft#4730) force node extensions to only require commonjs (microsoft#4755) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Chore to rebase main with bot projects. The conflict resolution involved adding disabled styles in Start bots panel for PVA bots
Skills that are PVA bots are hidden from showing up in the panel.
#minor
@tonyanziano
@zhixzhan @beyackle This rebase would resolve the issue of errors in consuming remote skill manifests