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

Development nuget #40

Merged
merged 51 commits into from
Jul 3, 2018
Merged

Development nuget #40

merged 51 commits into from
Jul 3, 2018

Conversation

tompaana
Copy link
Owner

@tompaana tompaana commented Jul 3, 2018

No description provided.

tompaana and others added 30 commits April 24, 2018 15:26
@tompaana
Cherrypicks changes from the master branch.
02c050f
@tompaana
Checks out the v4 development branch of the submodule.
7869563
@tompaana
Recreates the sample project using .NET Core 2.0 and Bot Framework v4…
fc1612f 
…. This will break the functionality.
@tompaana
Adds the basic bot code.
630199e
@tompaana
Adds HandoffHelper.
3f8aa4f
Introduce ConversationsController API endpoint
95f0587
Add initial versions of ConversationController and MessagesController
ff9bef3
Add intermediate comments to help explain what to do
28bd86e
Introduce ExceptionHandling class and configure IoC
6e1e83a
@tompaana
Fixes errors.
ef8fe18
@tompaana
Fixes errors.
fae50c0
@tompaana
Merge branch 'development' of https://github.com/tompaana/intermediat…
d1837b4 
…or-bot-sample into development
Apply more rest methods, WIP
965570a
Merge
827de5a
Add non-async version of the Get method to ExceptionHandler
a182bb0
Add synchronous Execute() method to the ExceptionHandler
88cff55
ConversationManager now can delete a conversation using channelId and…
e452178 
… conversationId
@tompaana
Adds ConversationHistory and MessageLog
cef30de
@tompaana
Merge branch 'development' of https://github.com/tompaana/intermediat…
9a26a5c 
…or-bot-sample into development
@tompaana
Minor change.
b4ed284
@tompaana
Minor changes.
ca6d630
@tompaana
Minor changes.
fbbcffb
Update references to match name changes in underlying API
9d49b16
UserInformation and ConversationInformation are now partial classes
4aa8500
Start the Message log handler for Azure table storage
d0b3446
Merge branch 'development' of https://github.com/tompaana/intermediat…
b3d03f5 
…or-bot-sample into development
@tompaana
Fixes compilation errors caused by the bot-message-routing update.
bfa0b76
@tompaana
Fixes compilation errors caused by the updated routing component.
6a66417
@tompaana
Refactors Command class.
01b7d8e
@tompaana
Minor fix.
e305a00
tompaana and others added 21 commits May 10, 2018 15:31
@tompaana
Major cleanup for simplification. Started with the middeware approach.
f3b6bd7
@tompaana
Moves the handoff logic from the IntermediatorBot class to the Handof…
0ca3355 
…fMiddleware class.
@tompaana
Refactors MessageRouterResultHandler and updates the string resources.
ca206b1
@tompaana
Finishes the implementation of MessageRouterResultHandler.
1c1b2c5
@tompaana
Fixes to HandoffMiddleware.
058bdfd
@tompaana
Minor change.
05fd4bd
@tompaana
Minor fixes.
3ad66cb
@tompaana
Fixes connection issues of users with matching channel account IDs.
075c447
@tompaana
Fixes to command handling.
5450fee
Updated link text
d49812e
@tompaana
Merge pull request #37 from GeekTrainer/patch-1
4542491 
Updated link text
@tompaana
Minor changes.
aabf581
@tompaana
Merge branch 'development' of https://github.com/tompaana/intermediat…
c5d64c7 
…or-bot-sample into development
@tompaana
Updates the Bot Message Routing component.
ccf7a99
@tompaana
Updates the Bot Message Routing component version and fixes several i…
465203d 
…ssues.
@tompaana
Updates documentation.
9f20baa
@tompaana
Updates the documentation and adds a minor fix to CommandHandler.
601b67e
@tompaana
Updates documentation.
2d6a91f
@tompaana
Updates README.md
a3e07cd
@tompaana
Merge branch 'development' into development_nuget
4bab760 
# Conflicts:
#	GIT_SUBMODULE_INSTRUCTIONS.md
#	IntermediatorBotSample.sln
#	IntermediatorBotSample/CommandHandling/CommandCardFactory.cs
#	IntermediatorBotSample/CommandHandling/CommandMessageHandler.cs
#	IntermediatorBotSample/Controllers/MessagesController.cs
#	IntermediatorBotSample/Dialogs/RootDialog.cs
#	IntermediatorBotSample/IntermediatorBotSample.csproj
#	IntermediatorBotSample/MessageRouting/MessageRouterResultHandler.cs
#	IntermediatorBotSample/MessageRouting/MessageRoutingUtils.cs
#	IntermediatorBotSample/Resources/StringConstants.cs
#	IntermediatorBotSample/Resources/Strings.Designer.cs
#	IntermediatorBotSample/Resources/Strings.resx
#	IntermediatorBotSample/packages.config
#	README.md
#	appveyor.yml
#	bot-message-routing
@tompaana
Fixes the merge errors.
ae0a174
@tompaana tompaana merged commit e7e65ce into master Jul 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@tompaana