| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into openpgp | James Booth | 2015-06-08 | 1 | -0/+1 |
| |\ | |||||
| | * | Set default autoaway mode to off | James Booth | 2015-06-08 | 1 | -0/+1 |
| | | | | | | | | | fixes #555 | ||||
| * | | Merge branch 'master' into openpgp | James Booth | 2015-06-05 | 10 | -13/+31 |
| |\| | | | | | | | | | Conflicts: .travis.yml | ||||
| | * | Merge branch 'master' into stabber-tests | James Booth | 2015-06-02 | 9 | -12/+53 |
| | |\ | |||||
| | * \ | Merge branch 'master' into stabber-tests | James Booth | 2015-05-25 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Added more connect tests | James Booth | 2015-05-24 | 2 | -1/+9 |
| | | | | | |||||
| | * | | | Added rooms iq test | James Booth | 2015-05-24 | 3 | -2/+5 |
| | | | | | |||||
| | * | | | Added bad password test | James Booth | 2015-05-24 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Merge branch 'master' into stabber-tests | James Booth | 2015-05-17 | 1 | -14/+12 |
| | |\ \ \ | |||||
| | * | | | | Added initial stabber test | James Booth | 2015-05-17 | 5 | -9/+13 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 9 | -12/+53 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 9 | -12/+53 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | | * | | | Tidy up windows when enabling | Pete | 2015-06-01 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | Merge branch '#551' of github.com:PMaynard/profanity into #551 | Pete | 2015-06-01 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Extra underline | Pete Maynard | 2015-06-01 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Added Theme UI option for window auto tidy | Pete | 2015-06-01 | 1 | -0/+1 |
| | | |/ / / | |||||
| | | * | | | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 4 | -13/+10 |
| | | | | | | | | | | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | ||||
| | | * | | | Added window auto tidy. | Pete | 2015-05-29 | 7 | -2/+42 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into openpgp | James Booth | 2015-05-25 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | Added jid to OTR errors in console | James Booth | 2015-05-25 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into openpgp | 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 | 3 | -36/+20 |
| |\| | |||||
| | * | Moved logic to notify_message | James Booth | 2015-05-10 | 3 | -36/+20 |
| | | | |||||
| * | | Moved pgp signature generation to cl_ev_presence_send | James Booth | 2015-05-08 | 3 | -24/+28 |
| | | | |||||
| * | | 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 | 5 | -18/+13 |
| |\| | |||||
| | * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 5 | -18/+13 |
| | | | |||||
| * | | 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 | 3 | -14/+19 |
| | | | |||||
| * | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 3 | -32/+39 |
| |\| | |||||
| | * | Added ui_contact_online | James Booth | 2015-05-07 | 3 | -32/+39 |
| | | | |||||
| * | | 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 |
| | | | |||||