Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge from master #3616

Merged
merged 34 commits into from
Jul 10, 2020

Conversation

GeoffCoxMSFT
Copy link
Member

Description

Regular merge from master

Task Item

#minor

Screenshots

N/A

beyackle and others added 30 commits June 26, 2020 11:34
* 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
* 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>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
without this config, jest would only collect coverage on files that were imported in a test
…ad (#3523)

* move AdaptiveForm components out of sub directory

* show loading spinner while waiting for form data and schema

Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
* allow input path

* handle corner case

* lint fix

* fix the flicker issue

* update UX and create or update folder operation

* refine code structure

* remove commented code

* fix unit test

* use esc to cancel operation

* handle comments

* handle comments

* add test case

* fix test case

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports
* + UT: adaptive-flow-renderer/widgets

* + UT: adaptive-flow-editor/utils

* remove unref hook: useWindowDimension

* + UT: KeyboardZone

* + UT: cursorTracker

* + UT: adaptive-flow-editor/constants

* +UT: AdaptiveFlowEditor

* + UT: adaptive-flow-editor/contexts

* + UT: useEditorEventApi

* fix CI error

* + UT: NodeWrapper

* + UT: EdgeMenu

* KeyboardZone behavioror test

* change the test file structure of cursorTracker
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* issues#3309

* fixes lints

* Default to bot settings if no route cache

* fix: #3485

* fix: #3486 Debug/Fix HMR support

* webpack bundle analyzer

Co-authored-by: Soroush <sorgh@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
* split some actions off setSettings

* add more actions - eject still not working

* fix arguments in eject

* split some actions off setSettings

* add more actions - eject still not working

* fix arguments in eject

* Update setting.ts

* fix some tests

* Update index.ts

* move logo-clicking to commands.ts

* Update commands.ts
* fix: Dialog validate throw error when delete an action

* use optional chaining and more explicit length check

* fix lint

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
* fix bug

* fix e2e test

* fix bug
* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports

* Index file renames Part 2
* move bot-deploy to plugins

* fix profile edit and save not saving to settings

* add dependency to electron-server

* update settings file clicking customized runtime toggle

Co-authored-by: Wenyi Luo <wenyluo@microsoft.com>
Co-authored-by: Dong Lei <donglei@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
Bumps [electron](https://github.com/electron/electron) from 8.0.2 to 8.2.4.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](electron/electron@v8.0.2...v8.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tony Anziano <toanzian@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* impl disable/enable editor API

* disable / enable e2e

* propagate the 'disabled' property

* take css out of CardTemplate

* take css out of ActionHeader

* connect to the 'disabled' property in data

* CSS: disbaled effect

* update icon of Disabled/Enabled

* rename inheritParentProperty

* shallow copy json in IndexedNode to support immutable

* rename files with  '.style' suffix

* apply disable effect to PromptWidget

* only disable nodes when disabled === true

* contextual Disable/Enable btn state

* move disable/enable button into toolbar

* avoid undefined array in UT
* Change versions

* Adds 1.0.2.md

* update uncategorized commits

Co-authored-by: Andy Brown <asbrown002@gmail.com>
* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Renamed components, hooks, Onboarding only

* Reverting changed from yar build

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Renamed components, hooks, Onboarding only

* Renamed components, hooks, Onboarding only

* Fixing lint issues

* test import fixes

* Have to rename to fix case of file name

* Fixing case with another commit.

* Fixing imports

* Index file renames Part 2

* Inlined styles in ts

* Fixed test mocks
yeze322 and others added 4 commits July 9, 2020 08:44
* let ToolBar support 'dropdown' type

* move 'design' page only toolbar items into DesignPage

* migrate 'Add New Trigger' coachmark feature

* grouping 'Edit' buttons together as a dropdown

* loosen 'type' TS type in toolbar
* refine diagnostics

* fix lg parse line number range

* update inline diagnostic

* update test

* resue websocket connection

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
@GeoffCoxMSFT GeoffCoxMSFT merged commit f0020d1 into feature/dialog-generation Jul 10, 2020
@GeoffCoxMSFT GeoffCoxMSFT deleted the gcox/merge-from-master-7-9 branch July 10, 2020 00:16
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.