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

feature: show multi-skill project with correct link behavior #4466

Merged
merged 98 commits into from
Oct 30, 2020
Merged

feature: show multi-skill project with correct link behavior #4466

merged 98 commits into from
Oct 30, 2020

Commits on Oct 5, 2020

  1. Update en-US.json

    @beyackle
    beyackle committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    7595021 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    78c3f7a View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    e0576b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. bring in stuff from the draft branch

    @beyackle
    beyackle committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    e6c088d View commit details
    Browse the repository at this point in the history

  2. make deletion work

    @beyackle
    beyackle committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    49d7ce0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    73b657e View commit details
    Browse the repository at this point in the history

  4. add error/warning icons

    @beyackle
    beyackle committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    9fa39e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    28c4baf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beyackle/botProjectTreeOnly' of https://github.com/micr… 

    …osoft/BotFramework-Composer into beyackle/botProjectTreeOnly
    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    e49078c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    bdb21db View commit details
    Browse the repository at this point in the history

  4. read notification map for state

    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    28fcadf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beyackle/botProjectTreeOnly' of https://github.com/micr… 

    …osoft/BotFramework-Composer into beyackle/botProjectTreeOnly
    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    ca31c22 View commit details
    Browse the repository at this point in the history

  6. fix type-checking and start on unit tests

    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    34d6415 View commit details
    Browse the repository at this point in the history

  7. add sampleDialog and fix more tests

    @beyackle
    beyackle committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    9cee86c View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. add showAll

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    ea7ced6 View commit details
    Browse the repository at this point in the history

  2. rename to onAllSelected because it's a callback

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    7a4fa20 View commit details
    Browse the repository at this point in the history

  3. update unit tests

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    69ddaa3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    fa557ef View commit details
    Browse the repository at this point in the history

  5. fix onSelect handling in ProjectTree

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    ebf8450 View commit details
    Browse the repository at this point in the history

  6. Update qna.test.tsx

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    ad66423 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    48ab9bf View commit details
    Browse the repository at this point in the history

  8. Update design.test.tsx

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    76bee68 View commit details
    Browse the repository at this point in the history

  9. add unit test

    @beyackle
    beyackle committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    b877aca View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2020

  1. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    762b2b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    463870a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    014a094 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    89caba3 View commit details
    Browse the repository at this point in the history

  2. fixes from PR comments

    @beyackle
    beyackle committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    a02da9b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    0a20716 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into beyackle/botProjectTreeOnly

    @beyackle
    beyackle committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    d00c42d View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Merge branch 'main' into beyackle/botProjectTreeOnly

    @cwhitten
    cwhitten committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    90c92d0 View commit details
    Browse the repository at this point in the history

  2. restore multibots to tree

    @beyackle
    beyackle committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    83c126d View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. fix links from project tree

    @beyackle
    beyackle committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    e498a2f View commit details
    Browse the repository at this point in the history

  2. fix wrong IDs in URL

    @beyackle
    beyackle committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    bf75528 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    a601063 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    74addaf View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    ec31343 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    bd88b7a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    97266a1 View commit details
    Browse the repository at this point in the history

  4. yarn.lock rebuild

    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    b32dfff View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    19d196c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    916a74b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    0407f62 View commit details
    Browse the repository at this point in the history

  8. update yarn.lock files

    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    bb61b65 View commit details
    Browse the repository at this point in the history

  9. fix action card links

    @beyackle
    beyackle committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    72ce95b View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    46237dd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    4272be6 View commit details
    Browse the repository at this point in the history

  3. Update DesignPage.tsx

    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    0d13f78 View commit details
    Browse the repository at this point in the history

  4. fix unit test

    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    03cc029 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    4fa9ccd View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    b3943f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    d593043 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    5ba58f2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    f705b59 View commit details
    Browse the repository at this point in the history

  4. add unit test to ExpandableNode

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    faaa7ca View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    bed80ec View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    709b2d0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    deabda9 View commit details
    Browse the repository at this point in the history

  8. update ProjectTree unit tests

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    399479c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    1d3ab78 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Update ExpandableNode.tsx

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    398988f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    76be81b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beyackle/botProjectWithSkills' of https://github.com/mi… 

    …crosoft/BotFramework-Composer into beyackle/botProjectWithSkills
    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    61f7290 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    48a77e5 View commit details
    Browse the repository at this point in the history

  5. add rootProjectId to triggerApi

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    1afebb7 View commit details
    Browse the repository at this point in the history

  6. fix creation and deletion bugs

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    f7ee2c6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    1b7ede9 View commit details
    Browse the repository at this point in the history

  8. change mocks folder name

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    360e98b View commit details
    Browse the repository at this point in the history

  9. Load design page only after skill project is loaded 

    Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
    Srinaath Ravichandran committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    3406a93 View commit details
    Browse the repository at this point in the history

  10. fixes from CR

    @beyackle
    beyackle committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    8f35732 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. fix more tests

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    e3fa82b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    17ad0c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    720dcc4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    e7b9c75 View commit details
    Browse the repository at this point in the history

  5. fix more unit tests

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    3d32857 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'beyackle/botProjectWithSkills' of https://github.com/mi… 

    …crosoft/BotFramework-Composer into beyackle/botProjectWithSkills
    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    fb0b597 View commit details
    Browse the repository at this point in the history

  7. fix test typol

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    3c106df View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    d1d530a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    7b5338d View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    7b4c93b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    8c3bcc3 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp… 

    …oser into main
    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    33c3cc5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    f429e6d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    d8aa80b View commit details
    Browse the repository at this point in the history

  4. handle clicks on bots as bot/id/skill/id

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    5662dcf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beyackle/botProjectWithSkills' of https://github.com/mi… 

    …crosoft/BotFramework-Composer into beyackle/botProjectWithSkills
    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    3219bad View commit details
    Browse the repository at this point in the history

  6. always go to dialog on click (not to a trigger in it)

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    ead752b View commit details
    Browse the repository at this point in the history

  7. fix unit tests

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    90a0a3f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    da75a72 View commit details
    Browse the repository at this point in the history

  9. fix link highlight for dialogs

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    a5bd2ee View commit details
    Browse the repository at this point in the history

  10. attempt to fix breadcrumbs (will finish in separate PR)

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    1affb13 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    f24f34f View commit details
    Browse the repository at this point in the history

  12. fixes from CR

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    3989f1e View commit details
    Browse the repository at this point in the history

  13. Update ProjectTree.tsx

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    0dcc8e1 View commit details
    Browse the repository at this point in the history

  14. Update ProjectTree.tsx

    @beyackle
    beyackle committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    502fe70 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Update ProjectTree.tsx

    @beyackle
    beyackle committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    e178197 View commit details
    Browse the repository at this point in the history

  2. fix unit tests to add correct multibot Recoil stuff

    @beyackle
    beyackle committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    70119c1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into beyackle/botProjectWithSkills

    @beyackle
    beyackle committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    58242b3 View commit details
    Browse the repository at this point in the history