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

feat: Start Botproject runtime in bot folder #1672

Merged
merged 54 commits into from
Jan 9, 2020
Merged

feat: Start Botproject runtime in bot folder #1672

merged 54 commits into from
Jan 9, 2020

Commits on Nov 28, 2019

  1. start runtime from samplpebot csharp runtime

    @VanyLaw
    VanyLaw committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    69ae226 View commit details
    Browse the repository at this point in the history

  2. fix

    @VanyLaw
    VanyLaw committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    1f3b631 View commit details
    Browse the repository at this point in the history

  3. fix

    @VanyLaw
    VanyLaw committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    b8670c9 View commit details
    Browse the repository at this point in the history

  4. fix

    @VanyLaw
    VanyLaw committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    6b04384 View commit details
    Browse the repository at this point in the history

  5. use logger instead of console log

    @VanyLaw
    VanyLaw committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    1e0ca12 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. Merge branch 'master' into wenyluo/csConnector

    @luhan2017
    luhan2017 authored Nov 29, 2019
    Configuration menu
    Copy the full SHA
    fbf2ed7 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge branch 'master' into wenyluo/csConnector

    @luhan2017
    luhan2017 authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    1b17984 View commit details
    Browse the repository at this point in the history

  2. fix comment

    @VanyLaw
    VanyLaw committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    3964fd7 View commit details
    Browse the repository at this point in the history

  3. fix comment

    @VanyLaw
    VanyLaw committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    c0f1411 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    0334bb8 View commit details
    Browse the repository at this point in the history

  2. add port usable validation and use log instead console log

    @VanyLaw
    VanyLaw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    306a0d2 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    99a2882 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. fix comments

    @VanyLaw
    VanyLaw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    14c4a21 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    4d989e6 View commit details
    Browse the repository at this point in the history

  3. move build script from template to server

    @VanyLaw
    VanyLaw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    543785b View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    396e7c7 View commit details
    Browse the repository at this point in the history

  2. polish output error message

    @VanyLaw
    VanyLaw committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    1cc7e70 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. remove environment

    @VanyLaw
    VanyLaw committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    4336354 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    a287f64 View commit details
    Browse the repository at this point in the history

  3. fix comments and add back the build script into template runtime

    @VanyLaw
    VanyLaw committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    ffb617e View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    9167b0f View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. add migrate old bot feature

    @VanyLaw
    VanyLaw committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    3d67936 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    6a28ec5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into wenyluo/csConnector

    @luhan2017
    luhan2017 authored Dec 9, 2019
    Configuration menu
    Copy the full SHA
    4394dc1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'wenyluo/csConnector' of https://github.com/microsoft/Bo… 

    …tFramework-Composer into wenyluo/csConnector
    @VanyLaw
    VanyLaw committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    3a76056 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    95da7fc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into wenyluo/csConnector

    @luhan2017
    luhan2017 authored Dec 9, 2019
    Configuration menu
    Copy the full SHA
    07b0120 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    a02ee26 View commit details
    Browse the repository at this point in the history

  2. change docker file

    @VanyLaw
    VanyLaw committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    5aebd48 View commit details
    Browse the repository at this point in the history

  3. remove annotation

    @VanyLaw
    VanyLaw committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    af79c2c View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. fix docker

    @VanyLaw
    VanyLaw committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    2985023 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    0d98187 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. simpler dockerfile

    @VanyLaw
    VanyLaw committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    019f623 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    c7ae546 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Merge branch 'master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw authored Dec 13, 2019
    Configuration menu
    Copy the full SHA
    32ac161 View commit details
    Browse the repository at this point in the history

  2. fix dockerfile bug and port mapping

    @VanyLaw
    VanyLaw committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    c05ec0d View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. add bash script for unix, and remove pwsh from docker

    @VanyLaw
    VanyLaw committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    7a7a2cb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    e3c2de8 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    0b0bca9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. fix typo and some comments

    @VanyLaw
    VanyLaw committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    4e1bfb5 View commit details
    Browse the repository at this point in the history

  2. split dockerfile into two

    @VanyLaw
    VanyLaw committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    1090b93 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    0bf8040 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    861d57e View commit details
    Browse the repository at this point in the history

  3. use nultistage instead of two dockerfile

    @VanyLaw
    VanyLaw committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    a791621 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    6a09761 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2019

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    3f7d035 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Merge branch 'master' into wenyluo/csConnector

    @cwhitten
    cwhitten authored Jan 6, 2020
    Configuration menu
    Copy the full SHA
    9b9e139 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    243f9c8 View commit details
    Browse the repository at this point in the history

  2. update yarn lock

    @VanyLaw
    VanyLaw committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    803fe7a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into wenyluo/csConnector

    @VanyLaw
    VanyLaw committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    20036eb View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge branch 'master' into wenyluo/csConnector

    @cwhitten
    cwhitten authored Jan 8, 2020
    Configuration menu
    Copy the full SHA
    d4be796 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into wenyluo/csConnector

    @cwhitten
    cwhitten authored Jan 8, 2020
    Configuration menu
    Copy the full SHA
    551c4a2 View commit details
    Browse the repository at this point in the history

  3. add more debug logs

    @a-b-r-o-w-n
    a-b-r-o-w-n committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    6ce7143 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. fix settings file mis-created in server folder

    @VanyLaw
    VanyLaw committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    429886e View commit details
    Browse the repository at this point in the history