about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Added signature verification, /pgp fps commandJames Booth2015-03-247-14/+130
* | Added check for HAVE_LIBGPGME in presence.cJames Booth2015-03-231-0/+4
* | Fixed tabsJames Booth2015-03-231-13/+13
* | Fixed tabsJames Booth2015-03-231-36/+36
* | Added pgpkeyid account setting, send signed presenceJames Booth2015-03-2316-19/+182
* | Added Id and fingerprint to pgp key listJames Booth2015-03-224-5/+40
* | Added /pgp libver commandJames Booth2015-03-225-5/+34
* | Fixed whitespaceJames Booth2015-03-221-1/+1
* | Added pgp key list commandJames Booth2015-03-2212-4/+210
|/
* Added individual options to send and request delivery receiptsJames Booth2015-03-198-21/+73
* Merge remote-tracking branch 'origin/master'James Booth2015-03-181-1/+1
|\
| * Fix buffer entry freeJames Booth2015-03-171-1/+1
* | Added keybindings for rxvtJames Booth2015-03-181-6/+13
|/
* Tidy cmd_tinyJames Booth2015-03-161-33/+44