about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
|\| |
| * | 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
|\| |
| * | Tidied account loginJames Booth2015-04-235-60/+79
* | | Merge branch 'master' into pgpJames Booth2015-04-223-109/+132
|\| |
| * | Moved login events to client events moduleJames Booth2015-04-223-98/+121
| * | Tidy execute alias codeJames Booth2015-04-211-11/+11
* | | Merge branch 'master' into pgpJames Booth2015-04-219-67/+102
|\| |
| * | Moved new chat win events to client events moduleJames Booth2015-04-219-67/+102
* | | Merge branch 'master' into pgpJames Booth2015-04-213-50/+57
|\| |
| * | Moved all message sending to client events moduleJames Booth2015-04-213-50/+57
* | | Merge branch 'master' into pgpJames Booth2015-04-211-5/+0
|\| |
| * | Removed unused otr checkJames Booth2015-04-191-5/+0
* | | Merge branch 'master' into pgpJames Booth2015-04-194-77/+132
|\| |
| * | Added client_events module, reuse message sending code for all commandsJames Booth2015-04-194-77/+132
* | | Merge branch 'master' into pgpJames Booth2015-04-198-223/+223
|\| |
| * | Renamed server event functionsJames Booth2015-04-198-221/+221
* | | Merge branch 'master' into pgpJames Booth2015-04-1910-10/+10
|\| |
| * | Moved server_events to event/James Booth2015-04-1910-10/+10
* | | Merge branch 'master' into pgpJames Booth2015-04-1216-23/+113
|\| |
| * | Added option to show jids in occupants panelJames Booth2015-04-1216-23/+113
* | | Merge branch 'master' into pgpJames Booth2015-04-121-1/+1
|\| |
| * | Updated travis build to include uuid-dev dependencyJames Booth2015-04-121-1/+1
* | | Merge branch 'master' into pgpJames Booth2015-04-117-28/+32
|\| |
| * | Autogenerate room name with UUID for /join with no argsJames Booth2015-04-117-28/+32
* | | Merge branch 'master' into pgpJames Booth2015-04-111-0/+1
|\| |
| * | Updated CHANGELOGJames Booth2015-04-111-0/+1
* | | Fixed message sending when not PGP key foundJames Booth2015-04-051-0/+2
* | | Merge branch 'master' into pgpJames Booth2015-03-297-17/+47
|\| |
| * | Use password for chat room invitesJames Booth2015-03-297-17/+47
* | | Merge branch 'master' into pgpJames Booth2015-03-293-4/+10
|\| |
| * | Added password to direct invitesJames Booth2015-03-293-4/+10
* | | Merge branch 'master' into pgpJames Booth2015-03-2911-30/+196
|\| |
| * | Add callback data to room disco info response handlerJames Booth2015-03-296-35/+103
| * | Set members only property when getting room featuresJames Booth2015-03-296-4/+26
| * | Added check members only room to send mediated invitesJames Booth2015-03-286-1/+77
* | | Decrypt incoming messagesJames Booth2015-03-253-5/+63
* | | Send encrypted messagesJames Booth2015-03-245-19/+109