about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Moved stub_gpg.cJames Booth2015-06-122-1/+1
* | Merge branch 'master' into openpgpJames Booth2015-06-1272-51/+51
|\|
| * Moved all tests to tests folderJames Booth2015-06-1272-51/+51
* | Moved gpg stubJames Booth2015-06-122-3/+3
* | Merge branch 'master' into openpgpJames Booth2015-06-121-0/+1
|\|
| * Added temp config files to gitignoreJames Booth2015-06-121-0/+1
* | Merge branch 'master' into openpgpJames Booth2015-06-121-57/+37
|\|
| * Tidied .gitignoreJames Booth2015-06-121-57/+37
* | Merge branch 'master' into openpgpJames Booth2015-06-081-1/+1
|\|
| * Changed log level to DEBUG for stabber functional testsJames Booth2015-06-081-1/+1
* | 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-071-1/+1
|\|
| * Specify log level when starting stabber, functional testsJames Booth2015-06-071-1/+1
* | Merge branch 'master' into openpgpJames Booth2015-06-071-0/+4
|\|
| * Disable desktop notifications for functional testsJames Booth2015-06-071-0/+4
* | Merge branch 'master' into openpgpJames Booth2015-06-071-0/+5
|\|
| * Added profanity timeout settings to functional testsJames Booth2015-06-071-0/+5
* | Merge branch 'master' into openpgpJames Booth2015-06-071-1/+1
|\|