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

Fix versioning for Bot.Builder.Classic #373

Merged
merged 21 commits into from
Apr 4, 2018
Merged

Conversation

BruceHaley
Copy link
Contributor

No description provided.

@BruceHaley BruceHaley requested a review from tomlm April 2, 2018 22:07
@msftclas
Copy link

msftclas commented Apr 2, 2018

CLA assistant check
All CLA requirements met.

@cleemullins
Copy link
Contributor

@tomlm Hey Tom, can you wrap this up? Would be great to get this merged in!

@tomlm tomlm merged commit 9b1e582 into master Apr 4, 2018
@cleemullins cleemullins deleted the v-brhale-fixNugetClassic branch April 9, 2018 20:36
ShYuPe pushed a commit to ShYuPe/botbuilder-dotnet that referenced this pull request Aug 25, 2020
…#373)

* fix ChoicePrompt none style when set via options

* black compat
ShYuPe pushed a commit to ShYuPe/botbuilder-dotnet that referenced this pull request Aug 25, 2020
* initial commit for Teams work

* initial commit for Teams

* adding teams activity handler, team info, and teams channel account classes

* adding conversation update scenario

* fixing linting issues

* updating classes to use standard attrs

* cleaning up PR feedback

* adding line

* adding another blank line

* adding mentions bot and fixing bug for resource response IDs

* Threading helper workaround

* Corrected case of "teams" folder name in core.  Corrected __init__.py in schema so TeamsChannelAccount was defined.

* adding mention bot

updating mention bot

cleaning up linter

removing readme, removing self from on_error

* resolving merge conflict

* adding mention bot

cleaning up linter

* updating linting

* adding mention bot

updating mention bot

cleaning up linter

removing readme, removing self from on_error

* resolving merge conflict

* adding mention bot

cleaning up linter

* updating linting

* Added 43.complex-dialog

* Pinned dependencies in all libraries

* adding activity update and delete

* adding list for activities

* cleaning up config

* Pinned dependencies in libraries (missed some setup.py)

* modify echo to work out of the box w/ ARM template

* Added 47.inspection (microsoft#381)

* Added 47.inspection, corrected README in 45.state-management

* Changed the on_error function to be unbound for consistency.

* ChoiceFactory.for_channel was erroneously returning a List instead of an Activity (microsoft#383)

* Refactored to unbound on_error methods when accessing outer app.py va… (microsoft#385)

* Refactored to unbound on_error methods when accessing outer app.py variables.

* Removed unused imports

* Added 16.proactive-messages (microsoft#413)

* Added 19.custom-dialogs (microsoft#411)

* Fix ChoicePrompt ListStyle.none when set via PromptOptions (microsoft#373)

* fix ChoicePrompt none style when set via options

* black compat

* Added 18.bot-authentication (microsoft#419)

* Added 17.multilingual-bot

* Added 23.facebook-events sample

* 23.facebook-events: on_error is now an unbound function

* Partial 15.handling-attachments

* Removing unnecesary encoding

* Added 15.handling-attachments

* 17.multilingual-bot suggested corrections

* 15.handling-attachments suggested corrections

* pylint and black, suggested corrections.

* pylint and black changes.  No logic changes. (microsoft#427)

* Fixes microsoft#425: Using incorrect BotState (microsoft#426)

* Added send_activities and updated the logic

* pylint: Added send_activities and updated the logic

* pylint: Added send_activities and updated the logic

* black formatter: Added send_activities and updated the logic

* Added 11.qnamaker (microsoft#429)

* Added 40.timex resolution (microsoft#430)

* Unfinished push until recognizers-text is updated.

* Added 40.timex-resolution

* Added 42.scaleout (microsoft#435)

* Pinned pytest version (microsoft#438)

* updating linting

* fixing linting

* initial commit for Teams work

* initial commit for Teams

* adding teams activity handler, team info, and teams channel account classes

* adding conversation update scenario

* fixing linting issues

* updating classes to use standard attrs

* cleaning up PR feedback

* adding line

* adding another blank line

* Corrected case of "teams" folder name in core.  Corrected __init__.py in schema so TeamsChannelAccount was defined.

* removing extension file

* resovling conflict

* more merge conflict resolution

* fixing linting

* fixing conflicts

* adding updated teams activity handler

* updating None check

* updating activity handler and fixing spacing issue

* updating activity handler and tests

* updating teams activity handler

* removing constant

* adding tests and removing constant

* moving scenarios to root

* updating attr check, using .seralize(), removing return

* rerunnign black

* updating names

* updating loop to downcast

* member not memeber

* adding s
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants