about summary refs log tree commit diff stats
path: root/src/xmpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
|
* Return after message receiptJames Booth2015-03-141-1/+1
|
* Merge branch 'master' into xep-0184James Booth2015-03-141-1/+1
|\
| * Check for sent and received carbonsJames Booth2015-03-141-1/+1
| |
* | Merge branch 'master' into xep-0184James Booth2015-03-141-33/+36
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Fixed error with /otr start with carbons enabledJames Booth2015-03-141-33/+36
| |
* | Show message received text for receiptsJames Booth2015-03-114-12/+20
| |
* | Added basic delivery receiptsJames Booth2015-03-113-36/+130
|/
* Send private carbons element with message when encryptedJames Booth2015-03-104-8/+45
|
* Added server error handling when setting /carbons preferenceJames Booth2015-03-092-46/+65
|
* Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280James Booth2015-03-086-1/+117
|\
| * mergeOlivier LE MOAL2015-02-231-1/+6
| |\
| | * fix segfault on self sent message carbonOlivier Le Moal2015-02-211-0/+5
| | |
| | * Add preference/commands for carbons messageOlivier LE MOAL2015-02-035-5/+43
| | |
| | * Add XEP-0280 supportOlivier LE MOAL2015-02-026-0/+73
| | |
| * | Add XEP-0280 supportOlivier LE MOAL2015-02-106-0/+111
| | |
* | | Lowercase barejid in JidJames Booth2015-02-231-0/+3
| | |
* | | Lowercase barejid before adding to rosterJames Booth2015-02-231-9/+11
| | |