about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* fix conflictsWill Song2015-05-29138-6044/+7295
|\
| * Added jid to OTR errors in consoleJames Booth2015-05-251-1/+1
| * Added uuid dependency to install-all.sh, opensuse, fedora and cygwinJames Booth2015-05-191-4/+4
| * 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 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
| |/
| * Tidy ui_room_messageJames Booth2015-05-101-60/+62
| * Moved logic to notify_messageJames Booth2015-05-104-37/+21
| * Added cl_ev_presence_sendJames Booth2015-05-075-8/+18
| * Renamed presence_update -> presence_sendJames Booth2015-05-077-22/+17
| * Tidied _roster_result_handlerJames Booth2015-05-071-32/+30
| * Added ui_contact_onlineJames Booth2015-05-076-95/+64
| * 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
| * Set ui nonblocking on presence updatesJames Booth2015-05-061-0/+6
| * Tidied form field autocompletersJames Booth2015-05-051-22/+26
| * 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
| * Use null check convention in window.cJames Booth2015-05-041-38/+38
| * Use null check convention in titlebar.cJames Booth2015-05-041-3/+3
| * Use null check convention in statusbar.cJames Booth2015-05-041-7/+7
| * Use null check convention in notifier.cJames Booth2015-05-041-4/+4
| * Use null check convention in core.cJames Booth2015-05-041-62/+62
| * Use null check convention in console.cJames Booth2015-05-041-80/+80
| * Use null check convention in tinyurl.cJames Booth2015-05-041-1/+1
| * Use null check convention in parser.cJames Booth2015-05-041-4/+4
| * Use null check convention in otrlibv4.cJames Booth2015-05-041-1/+1
| * Use null check convention in otrlibv3.cJames Booth2015-05-041-3/+3
| * Use null check convention in otr.cJames Booth2015-05-041-9/+9
| * Use null check convention in server_events.cJames Booth2015-05-041-7/+7
| * Use null check convention in theme.cJames Booth2015-05-041-8/+8
| * Use null check convention in preferences.cJames Booth2015-05-041-4/+4
| * Use null check convention in accounts.cJames Booth2015-05-041-17/+17
| * Use null check convention in account.cJames Booth2015-05-041-8/+8