Sebastian Kaspari
|
b597e149ff
|
Merge branch 'integration' of github.com:pocmo/Yaaic into integration
Conflicts:
src/org/jibble/pircbot/IdentServer.java
src/org/jibble/pircbot/InputThread.java
src/org/jibble/pircbot/OutputThread.java
src/org/jibble/pircbot/PircBot.java
|
2010-04-06 00:48:35 +02:00 |
|
Sebastian Kaspari
|
60f4412096
|
Merge branch 'master' into optimization
Conflicts:
src/org/yaaic/activity/ConversationActivity.java
src/org/yaaic/irc/IRCService.java
|
2010-03-29 22:04:38 +02:00 |
|
Sebastian Kaspari
|
239a8c0c2d
|
Merge branch 'master' of git://github.com/kell/Yaaic into integration
|
2010-03-26 19:31:28 +01:00 |
|
kell
|
6d01720ca6
|
added getDescription and help command
|
2010-03-26 19:05:37 +01:00 |
|
Sebastian Kaspari
|
4c5ba9a620
|
NamesHandler: Use broadcast type: CONVERSATION_MESSAGE
|
2010-03-26 19:03:43 +01:00 |
|
Sebastian Kaspari
|
c66eeecb0b
|
CommandParser and CommandHandlers: Use Broadcast helper methods
|
2010-03-24 19:31:59 +01:00 |
|
Sebastian Kaspari
|
04e496dc98
|
NamesHandler: cache field lookup
|
2010-03-21 16:36:44 +01:00 |
|
Sebastian Kaspari
|
7103510d1e
|
Moved CommandException to org.yaaic.exception package
|
2010-03-14 13:35:16 +01:00 |
|
Sebastian Kaspari
|
1bce5e1fc9
|
Added 2010 ;)
|
2010-03-13 16:52:20 +01:00 |
|
Sebastian Kaspari
|
0a5ded2e99
|
identation
|
2010-03-12 20:35:25 +01:00 |
|
Sebastian Kaspari
|
b87501622c
|
Renamed Broadcast constants from CHANNEL_* to CONVERSATION_*
|
2010-03-11 00:25:53 +01:00 |
|
Sebastian Kaspari
|
9a702f5d1a
|
Check conversation type on handler execution where needed
|
2010-03-10 21:14:20 +01:00 |
|
Sebastian Kaspari
|
9259ae2afd
|
All handlers now use conversations instead of channels
|
2010-03-10 21:06:18 +01:00 |
|
Sebastian Kaspari
|
64c7ad2f45
|
Moved command handlers to org.yaaic.command.handler and renamend them.
|
2010-03-10 09:01:49 +01:00 |