Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 8 | -151/+151 | |
|\| | ||||||
| * | Use null check convention in stanza.c | James Booth | 2015-05-04 | 1 | -32/+32 | |
| | | ||||||
| * | Use null check convention in roster.c | James Booth | 2015-05-04 | 1 | -11/+11 | |
| | | ||||||
| * | Use null check convention in presence.c | James Booth | 2015-05-04 | 1 | -21/+21 | |
| | | ||||||
| * | Use null check convention in iq.c | James Booth | 2015-05-04 | 1 | -48/+48 | |
| | | ||||||
| * | Use null check convention in form.c | James Booth | 2015-05-04 | 1 | -1/+1 | |
| | | ||||||
| * | Use null check convention in connection.c | James Booth | 2015-05-04 | 1 | -12/+12 | |
| | | ||||||
| * | Use null check convention in capabilities.c | James Booth | 2015-05-04 | 1 | -15/+15 | |
| | | ||||||
| * | Use null check convention in bookmark.c | James Booth | 2015-05-04 | 1 | -11/+11 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -40/+54 | |
|\| | ||||||
| * | Extracted carbons handling | James Booth | 2015-05-04 | 1 | -41/+55 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -52/+52 | |
|\| | ||||||
| * | Revert "Added carbons handler" | James Booth | 2015-05-04 | 1 | -52/+52 | |
| | | | | | | | | This reverts commit ff867e7f2bdfbd8856bd2a010e9d19b9a429a239. | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -52/+52 | |
|\| | ||||||
| * | Added carbons handler | James Booth | 2015-05-03 | 1 | -52/+52 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -12/+31 | |
|\| | ||||||
| * | Extracted receipt request processing in message.c | James Booth | 2015-05-03 | 1 | -12/+31 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -78/+83 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Extract private message hanlding in message.c | James Booth | 2015-05-03 | 1 | -66/+71 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -40/+50 | |
|\| | ||||||
| * | Tidy message.c | James Booth | 2015-05-03 | 1 | -40/+50 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -30/+34 | |
|\| | ||||||
| * | Extracted receipt received handler | James Booth | 2015-05-03 | 1 | -30/+34 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-02 | 1 | -68/+62 | |
|\| | ||||||
| * | Tidy message.c | James Booth | 2015-05-02 | 1 | -68/+62 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-01 | 4 | -36/+76 | |
|\| | ||||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 4 | -36/+76 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 5 | -79/+79 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 5 | -77/+77 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 5 | -79/+79 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Renamed server event functions | James Booth | 2015-04-19 | 5 | -77/+77 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 6 | -7/+7 | |
|\| | ||||||
| * | Moved server_events to event/ | James Booth | 2015-04-19 | 6 | -7/+7 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 1 | -1/+3 | |
|\| | ||||||
| * | Autogenerate room name with UUID for /join with no args | James Booth | 2015-04-11 | 1 | -1/+3 | |
| | | ||||||
* | | Fixed message sending when not PGP key found | James Booth | 2015-04-05 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -4/+13 | |
|\| | ||||||
| * | Use password for chat room invites | James Booth | 2015-03-29 | 1 | -4/+13 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 3 | -4/+10 | |
|\| | ||||||
| * | Added password to direct invites | James Booth | 2015-03-29 | 3 | -4/+10 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 5 | -25/+148 | |
|\| | ||||||
| * | Add callback data to room disco info response handler | James Booth | 2015-03-29 | 2 | -28/+95 | |
| | | ||||||
| * | Set members only property when getting room features | James Booth | 2015-03-29 | 2 | -3/+8 | |
| | | ||||||
| * | Added check members only room to send mediated invites | James Booth | 2015-03-28 | 3 | -1/+52 | |
| | | ||||||
* | | Decrypt incoming messages | James Booth | 2015-03-25 | 1 | -0/+16 | |
| | | ||||||
* | | Send encrypted messages | James Booth | 2015-03-24 | 3 | -2/+31 | |
| | | ||||||
* | | Added signature verification, /pgp fps command | James Booth | 2015-03-24 | 1 | -12/+23 | |
| | | ||||||
* | | Added check for HAVE_LIBGPGME in presence.c | James Booth | 2015-03-23 | 1 | -0/+4 | |
| | | ||||||
* | | Added pgpkeyid account setting, send signed presence | James Booth | 2015-03-23 | 2 | -0/+23 | |
|/ | ||||||
* | Added individual options to send and request delivery receipts | James Booth | 2015-03-19 | 1 | -3/+3 | |
| |