Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pgp | James Booth | 2015-04-27 | 5 | -74/+92 |
|\ | |||||
| * | Moved otr message send event to otr module | James Booth | 2015-04-27 | 4 | -33/+44 |
| | | |||||
| * | Removed server_events dependency on libotr headers | James Booth | 2015-04-27 | 4 | -41/+48 |
| | | |||||
| * | Renamed incoming otr message | James Booth | 2015-04-27 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-23 | 5 | -60/+79 |
|\| | | | | | | | | | Conflicts: src/config/account.h | ||||
| * | Tidied account login | James Booth | 2015-04-23 | 5 | -60/+79 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-22 | 3 | -109/+132 |
|\| | |||||
| * | Moved login events to client events module | James Booth | 2015-04-22 | 3 | -98/+121 |
| | | |||||
| * | Tidy execute alias code | James Booth | 2015-04-21 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 9 | -67/+102 |
|\| | |||||
| * | Moved new chat win events to client events module | James Booth | 2015-04-21 | 9 | -67/+102 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 3 | -50/+57 |
|\| | |||||
| * | Moved all message sending to client events module | James Booth | 2015-04-21 | 3 | -50/+57 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 1 | -5/+0 |
|\| | |||||
| * | Removed unused otr check | James Booth | 2015-04-19 | 1 | -5/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 4 | -77/+132 |
|\| | |||||
| * | Added client_events module, reuse message sending code for all commands | James Booth | 2015-04-19 | 4 | -77/+132 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 8 | -223/+223 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Renamed server event functions | James Booth | 2015-04-19 | 8 | -221/+221 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 10 | -10/+10 |
|\| | |||||
| * | Moved server_events to event/ | James Booth | 2015-04-19 | 10 | -10/+10 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 16 | -23/+113 |
|\| | |||||
| * | Added option to show jids in occupants panel | James Booth | 2015-04-12 | 16 | -23/+113 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: .travis.yml | ||||
| * | Updated travis build to include uuid-dev dependency | James Booth | 2015-04-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 7 | -28/+32 |
|\| | |||||
| * | Autogenerate room name with UUID for /join with no args | James Booth | 2015-04-11 | 7 | -28/+32 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 1 | -0/+1 |
|\| | |||||
| * | Updated CHANGELOG | James Booth | 2015-04-11 | 1 | -0/+1 |
| | | |||||
* | | 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 | 7 | -17/+47 |
|\| | |||||
| * | Use password for chat room invites | James Booth | 2015-03-29 | 7 | -17/+47 |
| | | |||||
* | | 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 | 11 | -30/+196 |
|\| | |||||
| * | Add callback data to room disco info response handler | James Booth | 2015-03-29 | 6 | -35/+103 |
| | | |||||
| * | Set members only property when getting room features | James Booth | 2015-03-29 | 6 | -4/+26 |
| | | |||||
| * | Added check members only room to send mediated invites | James Booth | 2015-03-28 | 6 | -1/+77 |
| | | |||||
* | | Decrypt incoming messages | James Booth | 2015-03-25 | 3 | -5/+63 |
| | | |||||
* | | Send encrypted messages | James Booth | 2015-03-24 | 5 | -19/+109 |
| | | |||||
* | | Added signature verification, /pgp fps command | James Booth | 2015-03-24 | 7 | -14/+130 |
| | | |||||
* | | Added check for HAVE_LIBGPGME in presence.c | James Booth | 2015-03-23 | 1 | -0/+4 |
| | | |||||
* | | Fixed tabs | James Booth | 2015-03-23 | 1 | -13/+13 |
| | | |||||
* | | Fixed tabs | James Booth | 2015-03-23 | 1 | -36/+36 |
| | | |||||
* | | Added pgpkeyid account setting, send signed presence | James Booth | 2015-03-23 | 16 | -19/+182 |
| | | |||||
* | | Added Id and fingerprint to pgp key list | James Booth | 2015-03-22 | 4 | -5/+40 |
| | | |||||
* | | Added /pgp libver command | James Booth | 2015-03-22 | 5 | -5/+34 |
| | | |||||
* | | Fixed whitespace | James Booth | 2015-03-22 | 1 | -1/+1 |
| | | |||||
* | | Added pgp key list command | James Booth | 2015-03-22 | 12 | -4/+210 |
|/ | |||||
* | Added individual options to send and request delivery receipts | James Booth | 2015-03-19 | 8 | -21/+73 |
| |