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

Issue5 #36

Merged
18 commits merged into from
Jan 12, 2012
Merged

Issue5 #36

18 commits merged into from
Jan 12, 2012

Conversation

cyberzed
Copy link
Contributor

#5: Baseline still done

Should be right this time...got control of my failed use of branches etc :D

Added baseline for private message handling
Conflicts:
	Jabbot.ConsoleBotHost/app.config
	Jabbot/Bot.cs
Conflicts:
	Jabbot.ConsoleBotHost/Jabbot.ConsoleBotHost.csproj
	Jabbot.ConsoleBotHost/app.config
	Jabbot.sln
	Jabbot/Bot.cs
Added IsPrivate to ChatMessage
Added HelloSprocket to the sample project
Refactored naming in the ChatMessage to be a bit more abstracted
…self

Killed the TwitterSprocket and reimplemented stuff in the twitter announcer
Temporary fix for the messed up post-build action
Conflicts:
	Extensions/SampleAnnouncement/EchoAnnouncement.cs
	Jabbot.CommandSprockets/IAnnounce.cs
	Jabbot.ConsoleBotHost/Jabbot.ConsoleBotHost.csproj
	Jabbot.ConsoleBotHost/get-packages.cmd
	Jabbot.sln
	Jabbot/Bot.cs
First part of #5 twitter integration done
Conflicts:
	Jabbot.ConsoleBotHost/Jabbot.ConsoleBotHost.csproj
	Jabbot/Bot.cs
ghost pushed a commit that referenced this pull request Jan 12, 2012
@ghost ghost merged commit 4c7034f into Code52:master Jan 12, 2012
This pull request was closed.
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.

1 participant