about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into stabber-testsJames Booth2015-05-191-1/+1
| |\ \ \ \
| * | | | | Fixed compiler warningsJames Booth2015-05-171-1/+5
| * | | | | Updated travis build, make stabber dependencyJames Booth2015-05-171-0/+8
| * | | | | Merge branch 'master' into stabber-testsJames Booth2015-05-171-14/+12
| |\ \ \ \ \
| * | | | | | Removed stbbr_stop from testJames Booth2015-05-171-2/+0
| * | | | | | Added initial stabber testJames Booth2015-05-1713-16/+60
| * | | | | | Added stabber testsuiteJames Booth2015-05-179-5/+791
* | | | | | | Merge branch 'master' into openpgpJames Booth2015-06-0213-13/+60
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge remote-tracking branch 'PMaynard/#551'James Booth2015-06-0213-13/+60
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Tidy up windows when enablingPete2015-06-011-0/+4
| | * | | | | Merge branch '#551' of github.com:PMaynard/profanity into #551Pete2015-06-011-1/+1
| | |\ \ \ \ \
| | | * | | | | Extra underlinePete Maynard2015-06-011-1/+1
| | * | | | | | Added Theme UI option for window auto tidyPete2015-06-011-0/+1
| | |/ / / / /
| | * | | | | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected und...Pete2015-06-015-14/+14
| | * | | | | Added winstidy to test stubPete Maynard2015-05-311-0/+1
| | * | | | | Added window auto tidy.Pete2015-05-297-2/+42
| |/ / / / /
* | | | | | Merge branch 'master' into openpgpJames Booth2015-05-251-1/+1
|\| | | | |
| * | | | | 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
|\|