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.

Sign up for GitHub

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

Jump to bottom

cherry pick changes from main #1194

Closed
wants to merge 18 commits into from
Closed

cherry pick changes from main #1194

wants to merge 18 commits into from

Commits on Apr 2, 2021

  1. Bumping version for next release (#1174)

    @munozemilio
    munozemilio committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    7e5fa93 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Fix for issue 1177 (#1178)

    @hcyang
    hcyang committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    74baacc View commit details
    Browse the repository at this point in the history

  2. Update add.ts

    @tsuwandy
    tsuwandy committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    2648f2c View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Replace node fetch to axios to enable proxy in luis and qnamaker build ( 

    #1182)

* replace node fetch and luis client to axios to enable proxy in luis and qnamaker build

* fix tests
    @feich-ms
    feich-ms committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    6745788 View commit details
    Browse the repository at this point in the history

  2. Fixes #1184 (#1185) 

    Treats files with identical content as not being duplicated.  This is because
nuget likes to copy the same files in multiple places.

Co-authored-by: Chris McConnell <chrimc>
    @chrimc62
    chrimc62 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    393d33d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. fix axios bug to support https proxy (#1186)

    @feich-ms
    feich-ms committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    1a5070e View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2021

  1. Merge branch 'main' into tiens-patch-1

    @tsuwandy
    tsuwandy committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    6a14e1e View commit details
    Browse the repository at this point in the history

  2. node-fetch-with-proxy changes

    @tsuwandy
    tsuwandy committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    1758a7c View commit details
    Browse the repository at this point in the history

  3. node-fetch -> node-fetch-with-proxy

    @tsuwandy
    tsuwandy committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    33dac07 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. Switch to axios to support proxy server when merging. (#1190) 

    * Switch to axios to support proxy server when merging.
Normalize sorting to reduce variation.

* modify https proxy setting

* refactor

* fix lint

* fix lint

Co-authored-by: Chris McConnell <chrimc>
Co-authored-by: cosmicshuai <shuai_uf@outlook.com>
    @chrimc62 @cosmicshuai
    chrimc62 and cosmicshuai committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    161c029 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tiens-patch-1

    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    92c6186 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @cosmicshuai
    cosmicshuai committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    4a13a96 View commit details
    Browse the repository at this point in the history

  4. fix for orchestrator:add -t luis/qna

    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    6ae3ee2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'tiens-patch-1' into 4.13

    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    bbe9e29 View commit details
    Browse the repository at this point in the history

  6. Revert "Merge branch 'tiens-patch-1' into 4.13" 

    This reverts commit bbe9e29, reversing
changes made to bf75952.
    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    0b33dd5 View commit details
    Browse the repository at this point in the history

  7. cherry pick changes from main

    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    805ce88 View commit details
    Browse the repository at this point in the history

  8. Update pnpm-lock.yaml

    @tsuwandy
    tsuwandy committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    9a4e061 View commit details
    Browse the repository at this point in the history

  9. Update to use orchestrator-core GA 4.13.0

    @daveta
    daveta committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    5b62c9b View commit details
    Browse the repository at this point in the history