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 from bot builder dev complete with history #5

Merged
merged 116 commits into from
Jan 18, 2018

Commits on Jul 21, 2017

  1. Configuration menu
    Copy the full SHA
    f8c6d9a View commit details
    Browse the repository at this point in the history
  2. Add Microsoft.Bot.Connector and Sample connector echoBot (TODO: add C…

    …onnector.Authentication and BotAuthenticationHanlder)
    msft-shahins committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    bf01473 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Configuration menu
    Copy the full SHA
    2ae5370 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    07b36f0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    56eaf01 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f9b6a86 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    430efec View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1a8b2e2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    296bd2e View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. fix warning and add lock files

    Tom Laird-McConnell committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    d327d67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ef60986 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2017

  1. merge

    Tom Laird-McConnell committed Aug 5, 2017
    Configuration menu
    Copy the full SHA
    356fb95 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. merge

    Tom Laird-McConnell committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    0fa2627 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a6f0f08 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. merge

    Tom Laird-McConnell committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    3fce7e6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    01fb4d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. Configuration menu
    Copy the full SHA
    fe3dab6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. add fi and storage implementations and unit tests around them

    Tom Laird-McConnell committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    7e1ea04 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2017

  1. add azure assembly with TableStorage implementation andunit tests

    Tom Laird-McConnell committed Aug 20, 2017
    Configuration menu
    Copy the full SHA
    30d2c6d View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. add translator stubbed out code,

    clean up interface definitions for middleware
    Tom Laird-McConnell committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    8b21c27 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2017

  1. add comments for table storage unit tests

    Tom Laird-McConnell committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    043c7ae View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Cosmetic changes. All tests still pass.

    Added in exception handling on public methods around parameters.
    General code cleanup and refactoring.
    
    Major changes coming in NEXT iteration with the removal of the crazy
    Dependepence Injection sytem that's there.
    cleemullins committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    310a0a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. Configuration menu
    Copy the full SHA
    8c72bce View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2017

  1. Configuration menu
    Copy the full SHA
    5eeafda View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. Configuration menu
    Copy the full SHA
    fe20533 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1b6aadc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7fac192 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2017

  1. Implemention of IntentRecognizerMiddleware, matching the semantics of

    the JS version. Tests included.
    cleemullins committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    2cb362b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7973dc6 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2017

  1. Added RegularExpressionMiddleware and related tests. Updated BotContext

    with needed methods, and brought up to parity with JS changes.
    cleemullins committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    8c20852 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2017

  1. Added RegEx Recognizers to the sample apps, and increased the complexity

    a bit to show handling multiple intents.
    cleemullins committed Sep 23, 2017
    Configuration menu
    Copy the full SHA
    36be560 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8569926 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Added base code for the Prague routing layer. Classes and Namespaces not

    finalized, but basic functionality and tests are now present.
    cleemullins committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    94b34f9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98fe60a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. Configuration menu
    Copy the full SHA
    0e1be8d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    43be82b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2017

  1. Configuration menu
    Copy the full SHA
    66c2824 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7fdee3c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2017

  1. Configuration menu
    Copy the full SHA
    8a23d60 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2017

  1. Configuration menu
    Copy the full SHA
    e75e6bf View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2017

  1. Configuration menu
    Copy the full SHA
    11a054c View commit details
    Browse the repository at this point in the history
  2. Created a defaulted OnReceive Delegate to Handled, to more closley al…

    …ign with the Typescript code base.
    cleemullins committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    12de6b0 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2017

  1. Configuration menu
    Copy the full SHA
    be8afb5 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. Added in Dialog class to being moving on to prompts.

    Rough copy of the Dialog classes in the JS implementaiton. Includes tests.
    cleemullins committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    e8116ce View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2017

  1. Added ability to derive from the BotStateManager, aligning with the TS

    behavior. This is required for customers such as Skype. Includes Tests.
    cleemullins committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    cedbe85 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2017

  1. Router or activity changes (#24)

    * Introduced IRouterOrHandler interface and plumbed through
    
    * Full Async version of Routing & Handling.
    cleemullins authored Oct 12, 2017
    Configuration menu
    Copy the full SHA
    151d212 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c684bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    313489f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2017

  1. rewrite of testconnector to sync with nodejs

    Tom Laird-McConnell committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    ab59ad0 View commit details
    Browse the repository at this point in the history
  2. changes based on code review feedback

    Tom Laird-McConnell committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    f703c45 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2017

  1. add C# unit test fixes for keys

    Tom Laird-McConnell committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    68a9141 View commit details
    Browse the repository at this point in the history
  2. fix typo in path

    Tom Laird-McConnell committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    918b180 View commit details
    Browse the repository at this point in the history
  3. Rive script.net (#31)

    * Initial code for Rivescript Middleware
    
    * Added Rivescript project
    
    * Initial code for Rivescript Middleware
    
    * Added Rivescript project
    
    * Initial Implementation and Tests for the Rivescript integration.
    
    * Rivescipt Midddleware + Tests
    cleemullins authored Oct 16, 2017
    Configuration menu
    Copy the full SHA
    cda7393 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. Rename connector to Adapter (#36)

    * rename all connnectors to adapters
    move adapters into folder
    Fix namespaces
    
    * removed unused usings
    
    * rename Connector to Adapter in node SDK
    Tom Laird-McConnell authored and cleemullins committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    6f7fd3b View commit details
    Browse the repository at this point in the history
  2. Updates Rivescript assemblies to reflect the Conenctor->Adapter chang…

    …es (#37)
    
    Code reviewed in-person with Tom.
    cleemullins authored Oct 17, 2017
    Configuration menu
    Copy the full SHA
    47eb05c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    65e0d33 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    38e94df View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2017

  1. Merge pull request #39 from Microsoft/MemoryStorageThreadSafe

    Made Memory Storage provider thread safe
    Tom Laird-McConnell authored Oct 18, 2017
    Configuration menu
    Copy the full SHA
    8306888 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4353e91 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2017

  1. Initial Port of Javascript Router. Previous ports of the Prague code

    were known to be changed. Current "Router" code is thought to be stable.
    Old code not yet removed, and will be dont it the next round of changes.
    cleemullins committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    4ee356e View commit details
    Browse the repository at this point in the history
  2. fix table storage tests to run on build server

    Tom Laird-McConnell committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    4365974 View commit details
    Browse the repository at this point in the history
  3. Added Additional Routing Rules: IfTrue, First, Best and related tests.

    Depricated relevant older classes
    cleemullins committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    dc79146 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #53 from Microsoft/RoutingSyncWithJS

    Routing sync with js
    Tom Laird-McConnell authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    a3bdd95 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. Configuration menu
    Copy the full SHA
    b494ce5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7fc0d1e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3fce1a2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    04d30d9 View commit details
    Browse the repository at this point in the history
  5. Refactor into package struture and generate Nuget on build (#60)

    * fix misnamed package
    
    * refactor into proper assemblies and add nuget definitions
    
    * refactor into multiple assemblies and add nuget definitions
    
    * 2nd stage of merging chris' changes
    Tom Laird-McConnell authored and Stevenic committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    d5a2ecf View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Configuration menu
    Copy the full SHA
    6185673 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2017

  1. initial implementation of csharp

    Tom Laird-McConnell committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    bf07120 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2017

  1. CSharp TemplateManager with initial unit tests

    Tom Laird-McConnell committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    b086f3a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2017

  1. added unit tests for templating

    Tom Laird-McConnell committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    af4daab View commit details
    Browse the repository at this point in the history
  2. add language fallback methods

    Tom Laird-McConnell committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    cda5b4f View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. rename templateEngine to renderer

    Tom Laird-McConnell committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    28a4ad2 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. Fix sample building on Linux (#102)

    Fix project reference path to make case match so it builds on Linux.
    drdarshan authored and cleemullins committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    9b4784e View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2017

  1. FlexObject Tests + Fixes (#106)

    * FlexObject Bug Fixes.
    Updated to latest NewtonSoft JSON
    Initial analytics fragments for Middleware consumption
    
    * Code cleanup prior to checking. Removing commented out methods, sorting
    usings, etc.
    
    * Removed unnecessary attribute discovered on visual code inspetion prior
    to PR.
    
    * Removed no-longer used attribute found during CR.
    cleemullins authored Nov 30, 2017
    Configuration menu
    Copy the full SHA
    b34a418 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb09636 View commit details
    Browse the repository at this point in the history
  3. move everything into tests folder

    Tom Laird-McConnell committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    07bd03e View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2017

  1. Asp net core auth fixes (#109)

    * Added in Auth to the EchoBot. Need to review with Tom in the morning.
    
    * Updated EchoBot to use latest ASP.Net Core2 auth and shared libraries
    cleemullins authored Dec 2, 2017
    Configuration menu
    Copy the full SHA
    b1cea0e View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2017

  1. fix typed serialization

    Tom Laird-McConnell committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    1fa9e2d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. add alarmbot sample

    Tom Laird-McConnell committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    4309848 View commit details
    Browse the repository at this point in the history
  2. cleanup comments

    Tom Laird-McConnell committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    c5453c3 View commit details
    Browse the repository at this point in the history
  3. update based on code review feedback

    Tom Laird-McConnell committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    34b4c55 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into tomsample

    Tom Laird-McConnell committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    d0caa07 View commit details
    Browse the repository at this point in the history
  5. add entity extraction

    Tom Laird-McConnell committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    a0c2c17 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. add a ton of comments to pipeline init

    Tom Laird-McConnell committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    43bc100 View commit details
    Browse the repository at this point in the history
  2. add qnamaker

    Tom Laird-McConnell committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    0a171d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. Configuration menu
    Copy the full SHA
    1d2182d View commit details
    Browse the repository at this point in the history
  2. update alarmbot to use datetime recognizer

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    6f509ec View commit details
    Browse the repository at this point in the history
  3. split templates out into topicViews folder

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    1f99117 View commit details
    Browse the repository at this point in the history
  4. tweak text

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    246aa63 View commit details
    Browse the repository at this point in the history
  5. fix errorneous added method

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    faae3b7 View commit details
    Browse the repository at this point in the history
  6. bump version and add packages for publishing

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    05d51f2 View commit details
    Browse the repository at this point in the history
  7. rev versions again

    Tom Laird-McConnell committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    bc9e5ce View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2017

  1. Configuration menu
    Copy the full SHA
    a1ea2c3 View commit details
    Browse the repository at this point in the history
  2. add readme to alarmbot sample

    Tom Laird-McConnell committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    184e603 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    548a45e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1a6d278 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d7f3b81 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Configuration menu
    Copy the full SHA
    65821ff View commit details
    Browse the repository at this point in the history
  2. Fixed ASP.Net Core2 MVC Sample that leverages DI. Use of Nuget Package

    for AspNetCore, and changes to Auth model
    cleemullins committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    0381c1b View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Make Card version of alarmbot

    Tom Laird-McConnell committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    ea2f244 View commit details
    Browse the repository at this point in the history
  2. update storage samples

    Tom Laird-McConnell committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    5fa1a28 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #123 from Microsoft/tomlm/CardAlarmBot

    Make Card version of alarmbot
    Tom Laird-McConnell authored Dec 11, 2017
    Configuration menu
    Copy the full SHA
    bfc1005 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5cac4e4 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2017

  1. fix pipelines for proactive bots, add unit tests for proactive bots

    Tom Laird-McConnell committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    9c81c8f View commit details
    Browse the repository at this point in the history
  2. add constant

    Tom Laird-McConnell committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    22f4137 View commit details
    Browse the repository at this point in the history
  3. Clm add show typing (#129)

    * Added Typing Helper, and set the stage for more.
    
    * Added Delay Methods
    
    * Added Tests around extension methods to context.
    
    * Moved to Async per code review feedback
    cleemullins authored Dec 12, 2017
    Configuration menu
    Copy the full SHA
    fab3c8b View commit details
    Browse the repository at this point in the history
  4. version bumptity bump bump

    Tom Laird-McConnell committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    d5d7e4a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f0c4ca0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7f5e158 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #134 from Microsoft/CLM-AddProactiveSample

    Add proactive sample
    Tom Laird-McConnell authored Dec 12, 2017
    Configuration menu
    Copy the full SHA
    af49e98 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. Migration to RussianDoll (.next()) style Middleware (#142)

    * Initial working set of MiddlwareSet and realted tests. Not yet
    integrated into the Bot.
    
    * Integration of Russian Doll Middleware.
    Migration to IBotContext in place of BotContext
    Migration to IActivity in place of Activity.
    
    * Tests and Bugfixes to enable MiddlwareSet to be composed.
    
    * Simplification to internal middleware next() code
    
    * Moved RunPipeline() from MiddlewareSet to Bot.
    
    * removed legacy middleware implementation
    
    * All Tests passing
    
    * Fixed missing Test attribute
    
    * Made Middleware example async
    
    * Makes AlarmBot Work
    
    * Updates to AlarmBot-Cards
    cleemullins authored Jan 11, 2018
    Configuration menu
    Copy the full SHA
    812b313 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Clm remove custom logger (#145)

    * Removed IBotLogger interface, in favor of using standard Tracing.
    
    * Removed no-longer-existing Console Connector. Not sure how this
    previously compiled.
    
    * Removed no-longer-used class from previous Middleware Implementation
    
    * Removed ancient no-longer-needed file
    cleemullins authored Jan 17, 2018
    Configuration menu
    Copy the full SHA
    adc0f55 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Configuration menu
    Copy the full SHA
    a2b3cec View commit details
    Browse the repository at this point in the history
  2. Merges from Dev

    cleemullins committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    20baa33 View commit details
    Browse the repository at this point in the history