about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into openpgpJames Booth2015-06-202-0/+19
|\|
| * Added /roster empty commandJames Booth2015-06-202-0/+19
* | Merge branch 'master' into openpgpJames Booth2015-06-191-0/+1
|\|
| * Added missing include client_events.cJames Booth2015-06-191-0/+1
* | Added initial /pgp start checksJames Booth2015-06-184-0/+113
* | Added cmd_pgp testsJames Booth2015-06-186-4/+69
* | Merge branch 'master' into openpgpJames Booth2015-06-171-1/+1
|\|
| * Merge remote-tracking branch 'quite/#513'James Booth2015-06-171-1/+1
| |\
| | * Let's only strip trailing whitespace when parsing commandDaniel2015-06-161-1/+1
* | | Merge branch 'master' into openpgpJames Booth2015-06-177-185/+139
|\| |
| * | Removed wins_get_current_* functionsJames Booth2015-06-177-185/+139
* | | Merge branch 'master' into openpgpJames Booth2015-06-1725-686/+691
|\| |
| * | Removed unused function prototypeJames Booth2015-06-171-2/+0
| * | Added current window reference to command functionsJames Booth2015-06-1724-578/+582
| * | Pass current window to autocompletersJames Booth2015-06-166-104/+107
| |/
* | Merge branch 'master' into openpgpJames Booth2015-06-156-103/+157
|\|
| * Tidied cmd_otr, added check-unit target to MakefileJames Booth2015-06-156-103/+157
* | Merge branch 'master' into openpgpJames Booth2015-06-155-27/+25
|\|
| * Removed ui_get_current_chat()James Booth2015-06-155-27/+25
* | Merge branch 'master' into openpgpJames Booth2015-06-1528-275/+312
|\|
| * Moved UI interfaces to ui.hJames Booth2015-06-1511-139/+208
| * Moved ui/windows -> window_listJames Booth2015-06-1516-24/+24
| * Moved refresh subwin logic to window.cJames Booth2015-06-153-21/+36
| * Added win_resize() functionJames Booth2015-06-153-29/+35
| * Added win_clear() functionJames Booth2015-06-158-18/+13
| * Removed unused variableJames Booth2015-06-151-2/+0
| * I removed ncurses header dependencies, removed unused codeJames Booth2015-06-158-52/+6
| * Updated boothj5 themeJames Booth2015-06-151-1/+1
* | Merge branch 'master' into openpgpJames Booth2015-06-141-1/+0
|\|
| * Removed test output from travis buildJames Booth2015-06-141-1/+0
* | Merge branch 'master' into openpgpJames Booth2015-06-146-28/+80
|\|
| * Set columns when running functional testsJames Booth2015-06-134-25/+76
| * Revert back to original rooms testJames Booth2015-06-131-8/+2
| * Travis build fixJames Booth2015-06-131-1/+2
| * Output test log in travis buildJames Booth2015-06-131-1/+1
| * Debugging travis buildJames Booth2015-06-131-1/+1
| * Debugging travis buildJames Booth2015-06-131-1/+2
| * Debugging travis buildJames Booth2015-06-131-5/+7
| * Use regex for multiline assert in rooms functional testJames Booth2015-06-131-2/+5
| * Changed assert order in rooms testJames Booth2015-06-131-3/+3
* | Merge branch 'master' into openpgpJames Booth2015-06-131-0/+3
|\|
| * Increase connection time, functional testsJames Booth2015-06-131-0/+3
* | Merge branch 'master' into openpgpJames Booth2015-06-1310-192/+100
|\|
| * Tidied functional testsJames Booth2015-06-1310-192/+100
* | 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-131-0/+1
|\|
| * Added codelite commands file to .gitignoreJames Booth2015-06-131-0/+1