about summary refs log tree commit diff stats
path: root/src/xmpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into pgpJames Booth2015-05-048-151/+151
|\|
| * Use null check convention in stanza.cJames Booth2015-05-041-32/+32
| |
| * Use null check convention in roster.cJames Booth2015-05-041-11/+11
| |
| * Use null check convention in presence.cJames Booth2015-05-041-21/+21
| |
| * Use null check convention in iq.cJames Booth2015-05-041-48/+48
| |
| * Use null check convention in form.cJames Booth2015-05-041-1/+1
| |
| * Use null check convention in connection.cJames Booth2015-05-041-12/+12
| |
| * Use null check convention in capabilities.cJames Booth2015-05-041-15/+15
| |
| * Use null check convention in bookmark.cJames Booth2015-05-041-11/+11
| |
* | Merge branch 'master' into pgpJames Booth2015-05-041-40/+54
|\|
| * Extracted carbons handlingJames Booth2015-05-041-41/+55
| |
* | Merge branch 'master' into pgpJames Booth2015-05-041-52/+52
|\|
| * Revert "Added carbons handler"James Booth2015-05-041-52/+52
| | | | | | | | This reverts commit ff867e7f2bdfbd8856bd2a010e9d19b9a429a239.
* | 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-12/+31
|\|
| * Extracted receipt request processing in message.cJames Booth2015-05-031-12/+31
| |
* | Merge branch 'master' into pgpJames Booth2015-05-031-78/+83
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Extract private message hanlding in message.cJames Booth2015-05-031-66/+71
| |
* | 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-014-36/+76
|\|
| * Removed server event delegation functionsJames Booth2015-05-014-36/+76
| |
* | Merge branch 'master' into pgpJames Booth2015-04-285-79/+79
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Renamed event functionsJames Booth2015-04-285-77/+77
| |
* | Merge branch 'master' into pgpJames Booth2015-04-195-79/+79
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Renamed server event functionsJames Booth2015-04-195-77/+77
| |
* | Merge branch 'master' into pgpJames Booth2015-04-196-7/+7
|\|
| * Moved server_events to event/James Booth2015-04-196-7/+7
| |
* | Merge branch 'master' into pgpJames Booth2015-04-111-1/+3
|\|
| * Autogenerate room name with UUID for /join with no argsJames Booth2015-04-111-1/+3
| |
* | Fixed message sending when not PGP key foundJames Booth2015-04-051-0/+2
| |
* | Merge branch 'master' into pgpJames Booth2015-03-291-4/+13
|\|
| * Use password for chat room invitesJames Booth2015-03-291-4/+13
| |
* | 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-295-25/+148
|\|
| * Add callback data to room disco info response handlerJames Booth2015-03-292-28/+95
| |
| * Set members only property when getting room featuresJames Booth2015-03-292-3/+8
| |
| * Added check members only room to send mediated invitesJames Booth2015-03-283-1/+52
| |
* | Decrypt incoming messagesJames Booth2015-03-251-0/+16
| |
* | Send encrypted messagesJames Booth2015-03-243-2/+31
| |
* | Added signature verification, /pgp fps commandJames Booth2015-03-241-12/+23
| |
* | Added check for HAVE_LIBGPGME in presence.cJames Booth2015-03-231-0/+4
| |
* | Added pgpkeyid account setting, send signed presenceJames Booth2015-03-232-0/+23
|/
* Added individual options to send and request delivery receiptsJames Booth2015-03-191-3/+3
|