Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into openpgp | James Booth | 2015-05-17 | 1 | -14/+12 |
|\ | |||||
| * | Merge remote-tracking branch 'adament/carbons' | James Booth | 2015-05-17 | 1 | -14/+12 |
| |\ | |||||
| | * | allow enabling / disabling carbons without being connected. | Adam Ehlers Nyholm Thomsen | 2015-05-17 | 1 | -14/+12 |
| |/ | |||||
* | | Removed libgpg include from presence.c | James Booth | 2015-05-10 | 1 | -4/+1 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 1 | -60/+62 |
|\| | |||||
| * | Tidy ui_room_message | James Booth | 2015-05-10 | 1 | -60/+62 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 4 | -37/+21 |
|\| | |||||
| * | Moved logic to notify_message | James Booth | 2015-05-10 | 4 | -37/+21 |
| | | |||||
* | | Moved pgp signature generation to cl_ev_presence_send | James Booth | 2015-05-08 | 7 | -27/+49 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 5 | -8/+18 |
|\| | |||||
| * | Added cl_ev_presence_send | James Booth | 2015-05-07 | 5 | -8/+18 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 7 | -22/+17 |
|\| | |||||
| * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 7 | -22/+17 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 1 | -32/+30 |
|\| | |||||
| * | Tidied _roster_result_handler | James Booth | 2015-05-07 | 1 | -32/+30 |
| | | |||||
* | | Moved pgp signature verification to sv_ev_contact_online | James Booth | 2015-05-07 | 5 | -17/+23 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 6 | -95/+64 |
|\| | |||||
| * | Added ui_contact_online | James Booth | 2015-05-07 | 6 | -95/+64 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 5 | -22/+37 |
|\| | |||||
| * | Optimised occupant comparisons, create utf8 collate key once | James Booth | 2015-05-07 | 2 | -9/+7 |
| | | |||||
| * | Optimised contact comparisons, create utf8 collate key once | James Booth | 2015-05-07 | 3 | -13/+30 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-06 | 1 | -0/+6 |
|\| | |||||
| * | Set ui nonblocking on presence updates | James Booth | 2015-05-06 | 1 | -0/+6 |
| | | | | | | | | Speeds up joining rooms, and connecting. | ||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-05 | 1 | -22/+26 |
|\| | |||||
| * | Tidied form field autocompleters | James Booth | 2015-05-05 | 1 | -22/+26 |
| | | |||||
* | | Use null check convention in gpg.c | James Booth | 2015-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 35 | -643/+643 |
|\| | |||||
| * | Use null check convention in roster_list.c | James Booth | 2015-05-04 | 1 | -15/+15 |
| | | |||||
| * | Use null check convention in resource.c | James Booth | 2015-05-04 | 1 | -2/+2 |
| | | |||||
| * | Use null check convention in profanity.c | James Booth | 2015-05-04 | 1 | -2/+2 |
| | | |||||
| * | Use null check convention in log.c | James Booth | 2015-05-04 | 1 | -8/+8 |
| | | |||||
| * | Use null check convention in jid.c | James Booth | 2015-05-04 | 1 | -5/+5 |
| | | |||||
| * | Use null check convention in contact.c | James Booth | 2015-05-04 | 1 | -14/+14 |
| | | |||||
| * | Use null check convention in common.c | James Booth | 2015-05-04 | 1 | -10/+10 |
| | | |||||
| * | Use null check convention in chat_session.c | James Booth | 2015-05-04 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | Use null check convention in windows.c | James Booth | 2015-05-04 | 1 | -18/+18 |
| | | |||||
| * | Use null check convention in window.c | James Booth | 2015-05-04 | 1 | -38/+38 |
| | | |||||
| * | Use null check convention in titlebar.c | James Booth | 2015-05-04 | 1 | -3/+3 |
| | | |||||
| * | Use null check convention in statusbar.c | James Booth | 2015-05-04 | 1 | -7/+7 |
| | | |||||
| * | Use null check convention in notifier.c | James Booth | 2015-05-04 | 1 | -4/+4 |
| | | |||||
| * | Use null check convention in core.c | James Booth | 2015-05-04 | 1 | -62/+62 |
| | | |||||
| * | Use null check convention in console.c | James Booth | 2015-05-04 | 1 | -80/+80 |
| | |