Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+11 |
|\| | |||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 1 | -23/+23 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Renamed event functions | James Booth | 2015-04-28 | 1 | -21/+21 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -23/+23 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Renamed server event functions | James Booth | 2015-04-19 | 1 | -21/+21 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -1/+1 |
|\| | |||||
| * | Moved server_events to event/ | James Booth | 2015-04-19 | 1 | -1/+1 |
| | | |||||
* | | 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 | 1 | -1/+3 |
|\| | |||||
| * | Added password to direct invites | James Booth | 2015-03-29 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -1/+10 |
|\| | |||||
| * | Added check members only room to send mediated invites | James Booth | 2015-03-28 | 1 | -1/+10 |
| | | |||||
* | | Decrypt incoming messages | James Booth | 2015-03-25 | 1 | -0/+16 |
| | | |||||
* | | Send encrypted messages | James Booth | 2015-03-24 | 1 | -1/+29 |
|/ | |||||
* | Added individual options to send and request delivery receipts | James Booth | 2015-03-19 | 1 | -3/+3 |
| | |||||
* | Return after message receipt | James Booth | 2015-03-14 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 1 | -1/+1 |
|\ | |||||
| * | Check for sent and received carbons | James Booth | 2015-03-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 1 | -33/+36 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Fixed error with /otr start with carbons enabled | James Booth | 2015-03-14 | 1 | -33/+36 |
| | | |||||
* | | Show message received text for receipts | James Booth | 2015-03-11 | 1 | -6/+16 |
| | | |||||
* | | Added basic delivery receipts | James Booth | 2015-03-11 | 1 | -16/+87 |
|/ | |||||
* | Send private carbons element with message when encrypted | James Booth | 2015-03-10 | 1 | -6/+34 |
| | |||||
* | Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 | James Booth | 2015-03-08 | 1 | -1/+44 |
|\ | |||||
| * | merge | Olivier LE MOAL | 2015-02-23 | 1 | -1/+6 |
| |\ | |||||
| | * | fix segfault on self sent message carbon | Olivier Le Moal | 2015-02-21 | 1 | -0/+5 |
| | | | |||||
| | * | Add XEP-0280 support | Olivier LE MOAL | 2015-02-02 | 1 | -0/+38 |
| | | | |||||
| * | | Add XEP-0280 support | Olivier LE MOAL | 2015-02-10 | 1 | -0/+38 |
| |/ | |||||
* / | Updated copyright | James Booth | 2015-02-10 | 1 | -1/+1 |
|/ | |||||
* | Only show UI events for chat states when in session | James Booth | 2015-01-11 | 1 | -1/+1 |
| | |||||
* | Added remaining chat states | James Booth | 2015-01-11 | 1 | -27/+26 |
| | |||||
* | Send active chat state, handle composing and gone from recipients | James Booth | 2015-01-10 | 1 | -25/+21 |
| | |||||
* | Show resource in titlebar and on each message | James Booth | 2015-01-10 | 1 | -1/+1 |
| |