about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into pgpJames Booth2015-04-293-2/+8
|\
| * Added ui_win_error_line()James Booth2015-04-293-2/+8
| |
* | Merge branch 'master' into pgpJames Booth2015-04-299-156/+120
|\|
| * Return result on OTR message sendingJames Booth2015-04-299-47/+63
| |
| * 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-2813-277/+325
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Added ui events moduleJames Booth2015-04-285-16/+90
| |
| * Renamed event functionsJames Booth2015-04-2810-237/+237
| |
| * Removed commented codeJames Booth2015-04-281-26/+0
| |
* | Merge branch 'master' into pgpJames Booth2015-04-274-73/+89
|\|
| * Moved otr message send event to otr moduleJames Booth2015-04-273-33/+43
| |
| * Removed server_events dependency on libotr headersJames Booth2015-04-273-40/+46
| |
| * Renamed incoming otr messageJames Booth2015-04-271-6/+6
| |
* | Merge branch 'master' into pgpJames Booth2015-04-235-60/+79
|\| | | | | | | | | Conflicts: src/config/account.h
| * 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-217-61/+87
|\|
| * Moved new chat win events to client events moduleJames Booth2015-04-217-61/+87
| |
* | 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-193-77/+130
|\|
| * Added client_events module, reuse message sending code for all commandsJames Booth2015-04-193-77/+130
| |
* | Merge branch 'master' into pgpJames Booth2015-04-197-209/+209
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Renamed server event functionsJames Booth2015-04-197-207/+207
| |
* | Merge branch 'master' into pgpJames Booth2015-04-198-7/+7
|\|
| * Moved server_events to event/James Booth2015-04-198-7/+7
| |
* | Merge branch 'master' into pgpJames Booth2015-04-1212-21/+109
|\|
| * Added option to show jids in occupants panelJames Booth2015-04-1212-21/+109
| |
* | Merge branch 'master' into pgpJames Booth2015-04-113-9/+29
|\|
| * Autogenerate room name with UUID for /join with no argsJames Booth2015-04-113-9/+29
| |
* | Fixed message sending when not PGP key foundJames Booth2015-04-051-0/+2
| |
* | Merge branch 'master' into pgpJames Booth2015-03-296-10/+40
|\|
| * Use password for chat room invitesJames Booth2015-03-296-10/+40
| |
* | 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-2910-29/+195
|\|
| * Add callback data to room disco info response handlerJames Booth2015-03-295-34/+102
| |
| * Set members only property when getting room featuresJames Booth2015-03-295-3/+25
| |
| * 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-246-13/+121
| |
* | Added check for HAVE_LIBGPGME in presence.cJames Booth2015-03-231-0/+4
| |