about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Added jid to OTR errors in consoleJames Booth2015-05-251-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into openpgpJames Booth2015-05-191-4/+4
|\| | | | |
| * | | | | Added uuid dependency to install-all.sh, opensuse, fedora and cygwinJames Booth2015-05-191-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' into openpgpJames Booth2015-05-191-1/+1
|\| | | |
| * | | | Merge pull request #547 from PMaynard/update-install-script-for-uuid-devJames Booth2015-05-191-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Udpate installer.sh for Debain to unclude uuid-devPete Maynard2015-05-181-1/+1
| |/ / /
* | | | Merge branch 'master' into openpgpJames Booth2015-05-171-14/+12
|\| | |
| * | | Merge remote-tracking branch 'adament/carbons'James Booth2015-05-171-14/+12
| |\ \ \ | | |/ / | |/| |
| | * | allow enabling / disabling carbons without being connected.Adam Ehlers Nyholm Thomsen2015-05-171-14/+12
| |/ /
* | | Removed libgpg include from presence.cJames Booth2015-05-101-4/+1
* | | Merge branch 'master' into openpgpJames Booth2015-05-101-60/+62
|\| |
| * | Tidy ui_room_messageJames Booth2015-05-101-60/+62
* | | Merge branch 'master' into openpgpJames Booth2015-05-104-37/+21
|\| |
| * | Moved logic to notify_messageJames Booth2015-05-104-37/+21
* | | Moved pgp signature generation to cl_ev_presence_sendJames Booth2015-05-087-27/+49
* | | Merge branch 'master' into openpgpJames Booth2015-05-075-8/+18
|\| |
| * | Added cl_ev_presence_sendJames Booth2015-05-075-8/+18
* | | Merge branch 'master' into openpgpJames Booth2015-05-077-22/+17
|\| |
| * | Renamed presence_update -> presence_sendJames Booth2015-05-077-22/+17
* | | Merge branch 'master' into openpgpJames Booth2015-05-071-32/+30
|\| |
| * | Tidied _roster_result_handlerJames Booth2015-05-071-32/+30
* | | Moved pgp signature verification to sv_ev_contact_onlineJames Booth2015-05-075-17/+23
* | | Merge branch 'master' into openpgpJames Booth2015-05-076-95/+64
|\| |
| * | Added ui_contact_onlineJames Booth2015-05-076-95/+64
* | | Merge branch 'master' into openpgpJames Booth2015-05-075-22/+37
|\| |
| * | Optimised occupant comparisons, create utf8 collate key onceJames Booth2015-05-072-9/+7
| * | Optimised contact comparisons, create utf8 collate key onceJames Booth2015-05-073-13/+30
* | | Merge branch 'master' into openpgpJames Booth2015-05-061-0/+6
|\| |
| * | Set ui nonblocking on presence updatesJames Booth2015-05-061-0/+6
* | | Merge branch 'master' into openpgpJames Booth2015-05-051-22/+26
|\| |
| * | Tidied form field autocompletersJames Booth2015-05-051-22/+26
* | | Use null check convention in gpg.cJames Booth2015-05-041-1/+1
* | | Merge branch 'master' into pgpJames Booth2015-05-0435-643/+643
|\| |
| * | Use null check convention in roster_list.cJames Booth2015-05-041-15/+15
| * | Use null check convention in resource.cJames Booth2015-05-041-2/+2
| * | Use null check convention in profanity.cJames Booth2015-05-041-2/+2
| * | Use null check convention in log.cJames Booth2015-05-041-8/+8
| * | Use null check convention in jid.cJames Booth2015-05-041-5/+5
| * | Use null check convention in contact.cJames Booth2015-05-041-14/+14
| * | Use null check convention in common.cJames Booth2015-05-041-10/+10
| * | Use null check convention in chat_session.cJames Booth2015-05-041-2/+2
| * | Use null check convention in stanza.cJames Booth2015-05-041-32/+32
| * | Use null check convention in roster.cJames Booth2015-05-041-11/+11
| * | Use null check convention in presence.cJames Booth2015-05-041-21/+21
| * | Use null check convention in iq.cJames Booth2015-05-041-48/+48
| * | Use null check convention in form.cJames Booth2015-05-041-1/+1
| * | Use null check convention in connection.cJames Booth2015-05-041-12/+12
| * | Use null check convention in capabilities.cJames Booth2015-05-041-15/+15
| * | Use null check convention in bookmark.cJames Booth2015-05-041-11/+11
| * | Use null check convention in windows.cJames Booth2015-05-041-18/+18