about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into pgpJames Booth2015-05-048-27/+33
|\| |
| * | Added ui_ev_new_private_win to ui eventsJames Booth2015-05-048-27/+33
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-043-5/+5
|\| |
| * | cl_ev_send_muc_msg takes ProfMucWin as argJames Booth2015-05-043-5/+5
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-045-15/+13
|\| |
| * | ui_outgoing_chat_msg now takes ProfChatWin as argumentJames Booth2015-05-045-15/+13
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-043-24/+37
|\| |
| * | Added roster list function to get display name for messagesJames Booth2015-05-033-24/+37
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-031-52/+52
|\| |
| * | Added carbons handlerJames Booth2015-05-031-52/+52
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-031-1/+6
|\| |
| * | Show resource in status barJames Booth2015-05-031-1/+6
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-031-12/+31
|\| |
| * | Extracted receipt request processing in message.cJames Booth2015-05-031-12/+31
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-033-82/+87
|\| | | | | | | | | | | | | | Conflicts: src/xmpp/message.c
| * | Extract private message hanlding in message.cJames Booth2015-05-033-70/+75
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-031-40/+50
|\| |
| * | Tidy message.cJames Booth2015-05-031-40/+50
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-031-30/+34
|\| |
| * | Extracted receipt received handlerJames Booth2015-05-031-30/+34
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-021-68/+62
|\| |
| * | Tidy message.cJames Booth2015-05-021-68/+62
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-024-52/+22
|\| |
| * | Pass ProfChatWin to otr_on_message_sendJames Booth2015-05-024-52/+22
| | |
* | | Merge branch 'master' into pgpJames Booth2015-05-018-394/+76
|\| |
| * | Removed server event delegation functionsJames Booth2015-05-018-394/+76
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-307-90/+30
|\| |
| * | Move current win check to event, removed next and prev win functionsJames Booth2015-04-307-90/+30
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-3010-154/+77
|\| |
| * | Removed ui_win_switch_numJames Booth2015-04-3010-155/+77
| | |
| * | Added assert to ui_switch_winJames Booth2015-04-301-0/+1
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-304-36/+13
|\| |
| * | Removed some ui functions, inlinedJames Booth2015-04-304-36/+13
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-294-2/+10
|\| |
| * | Added ui_win_error_line()James Booth2015-04-294-2/+10
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-2911-158/+131
|\| |
| * | Return result on OTR message sendingJames Booth2015-04-2911-49/+74
| | |
| * | Return new window on new chat win eventJames Booth2015-04-293-12/+9
| | |
| * | Changed message when sending non encrypted message with OTR policy alwaysJames Booth2015-04-291-2/+2
| | |
| * | Reuse ui_new_chat_winJames Booth2015-04-291-55/+17
| | |
| * | _win_show_history takes ProfChatWin as first argJames Booth2015-04-291-66/+55
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-2815-291/+341
|\| | | | | | | | | | | | | | Conflicts: src/xmpp/message.c
| * | Added ui events moduleJames Booth2015-04-286-16/+92
| | |
| * | Renamed event functionsJames Booth2015-04-2811-251/+251
| | |
| * | Removed commented codeJames Booth2015-04-281-26/+0
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-275-74/+92
|\| |
| * | Moved otr message send event to otr moduleJames Booth2015-04-274-33/+44
| | |
| * | Removed server_events dependency on libotr headersJames Booth2015-04-274-41/+48
| | |
| * | Renamed incoming otr messageJames Booth2015-04-271-6/+6
| | |
* | | Merge branch 'master' into pgpJames Booth2015-04-235-60/+79
|\| | | | | | | | | | | | | | Conflicts: src/config/account.h