about summary refs log tree commit diff stats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into openpgpJames Booth2015-06-141-15/+54
|\
| * Set columns when running functional testsJames Booth2015-06-131-15/+54
* | Merge branch 'master' into openpgpJames Booth2015-06-134-7/+7
|\|
| * Renamed otr trusted window propertyJames Booth2015-06-134-7/+7
* | Show message when offline for /pgp fpsJames Booth2015-06-131-13/+18
* | Removed TODO in gpg.cJames Booth2015-06-131-1/+0
* | Merge branch 'master' into openpgpJames Booth2015-06-081-0/+1
|\|
| * Set default autoaway mode to offJames Booth2015-06-081-0/+1
* | Merge branch 'master' into openpgpJames Booth2015-06-0510-13/+31
|\|
| * Merge branch 'master' into stabber-testsJames Booth2015-06-029-12/+53
| |\
| * \ Merge branch 'master' into stabber-testsJames Booth2015-05-251-1/+1
| |\ \
| * | | Added more connect testsJames Booth2015-05-242-1/+9
| * | | Added rooms iq testJames Booth2015-05-243-2/+5
| * | | Added bad password testJames Booth2015-05-241-1/+4
| * | | Merge branch 'master' into stabber-testsJames Booth2015-05-171-14/+12
| |\ \ \
| * | | | Added initial stabber testJames Booth2015-05-175-9/+13
* | | | | Merge branch 'master' into openpgpJames Booth2015-06-029-12/+53
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'PMaynard/#551'James Booth2015-06-029-12/+53
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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-014-13/+10
| | * | | 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-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-103-36/+20
|\|
| * Moved logic to notify_messageJames Booth2015-05-103-36/+20
* | Moved pgp signature generation to cl_ev_presence_sendJames Booth2015-05-083-24/+28
* | 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-075-18/+13
|\|
| * Renamed presence_update -> presence_sendJames Booth2015-05-075-18/+13
* | 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-073-14/+19
* | Merge branch 'master' into openpgpJames Booth2015-05-073-32/+39
|\|
| * Added ui_contact_onlineJames Booth2015-05-073-32/+39
* | 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
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-19 01:19:22 +0000