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

merge master into 4.future #1964

Merged
merged 1,299 commits into from
Apr 2, 2020
Merged

merge master into 4.future #1964

merged 1,299 commits into from
Apr 2, 2020

Conversation

chon219
Copy link
Member

@chon219 chon219 commented Mar 31, 2020

Description

Merge master into 4.future

Specific Changes

Testing

daveta and others added 30 commits October 19, 2019 13:25
…ent (#1334)

* add working ws websocket impl

* remove unused constants
Change TS output to ES6 for all libraries
Adds createChildContext method to ComponentDialog
use timestamp or processing time as fallback for activity.id
QnaMaker: Rename Prompt -> QnAMakerPrompt
Danieladu and others added 27 commits March 16, 2020 11:19
* update lg tsconfig

* migrate C# format comments to js comments

* re-trigger ci
* remove array function, support multiline expr

* adding type checking related functions

* ensure more operators support multi line exprs

* revert ExpressionAntlrParser

* add more tests

* fix some format and add a test for createArray

* remove multiline

* remove test

* revert change

* revert
* init

* add support for multi line expr in LG

* fix test case

* remove only in test

* undo comment
…1927)

* Move DeepEquals and References from extensions to Expression class

* revert package.json

* revert package.json

* revert package.json

* retrigger ci
* create Array via [...]

* add more tests

* more test on array create and index access

* fix a typo
* port C# remove dynamic

* update

* retrigger ci

* update
* lf escape

* add more tests
- increased timeout of expressionParser test

Co-authored-by: Steven Gum <14935595+stevengum@users.noreply.github.com>
@Stevenic Stevenic merged commit 96372a9 into 4.future Apr 2, 2020
@Stevenic Stevenic deleted the zim/merge-master-into-4.future branch April 2, 2020 23:09
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.