Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' into opensuse | James Booth | 2014-03-06 | 8 | -41/+41 | |
|\ | ||||||
| * | Merge remote-tracking branch 'pasis/gitversion' | James Booth | 2014-03-06 | 8 | -41/+41 | |
| |\ | ||||||
| | * | fixed build error when make run with -jN option | Dmitry Podgorny | 2014-03-06 | 8 | -41/+41 | |
| |/ | | | | | | | | | Race can occur when gitversion file isn't fully generated before it is used. | |||||
* | | Merge branch 'master' into opensuse | James Booth | 2014-03-05 | 7 | -24/+99 | |
|\| | ||||||
| * | Added autocompeleter for /join options | James Booth | 2014-03-05 | 1 | -8/+37 | |
| | | ||||||
| * | Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs' | James Booth | 2014-03-05 | 7 | -16/+62 | |
| |\ | ||||||
| | * | Ensuring nick is set when not included in opt args for cmd_join | Kristofer M White | 2014-03-05 | 1 | -2/+3 | |
| | | | ||||||
| | * | Removing extra `nick = ` line that broke nick assignment | Kristofer M White | 2014-03-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | Removing strdup calls per cmd_connect design | Kristofer M White | 2014-03-05 | 1 | -4/+4 | |
| | | | ||||||
| | * | Parsing optional args for cmd_join | Kristofer M White | 2014-03-05 | 2 | -12/+37 | |
| | | | ||||||
| | * | Making whitespace consistently spaces, not tabs | Kristofer M White | 2014-02-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Adding password handling for joining chatrooms | Kristofer M White | 2014-02-27 | 6 | -8/+27 | |
| | | | ||||||
| | * | Updating cmd description | Kristofer M White | 2014-02-25 | 1 | -3/+4 | |
| | | | ||||||
* | | | Merge branch 'master' into opensuse | James Booth | 2014-03-05 | 3 | -12/+59 | |
|\| | | ||||||
| * | | Merge branch 'osx-notify' | James Booth | 2014-03-05 | 2 | -7/+56 | |
| |\ \ | ||||||
| | * | | Added configure checks to enable desktop notifications on OSX | James Booth | 2014-03-04 | 2 | -7/+32 | |
| | | | | ||||||
| | * | | Log message when cannot send desktop nofication | James Booth | 2014-03-04 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | Added OSX desktop notifications using terminal-notifier | James Booth | 2014-03-04 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | Requires Xcode WIP - No configure.ac changes | |||||
| * | | | Fixed spelling mistake in configure.ac | James Booth | 2014-03-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Removed gcc linking from cygwin install | James Booth | 2014-03-04 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | Added libgcrypt-devel to cygwin dependencies | James Booth | 2014-03-04 | 1 | -2/+2 | |
| |/ / | ||||||
* | | | Changes to get install-all.sh working on fresh opensuse VM | James Booth | 2014-02-25 | 2 | -3/+4 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'william20111/master' into opensuse | James Booth | 2014-02-25 | 1 | -0/+14 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Added opensuse support for the install. Now getting an error relating | william | 2014-02-21 | 1 | -0/+14 | |
| | | | | | | | | | | | | ncurses wget_wch after the libstrophe compile | |||||
* | | | Merge pull request #309 from mrshu/install-fix | James Booth | 2014-02-25 | 2 | -20/+32 | |
|\ \ \ | |_|/ |/| | | Install fix | |||||
| * | | fixed indent in Makefile.am | mr.Shu | 2014-02-25 | 1 | -18/+18 | |
| | | | ||||||
| * | | added error tracing | mr.Shu | 2014-02-25 | 1 | -1/+13 | |
| | | | ||||||
| * | | cleaned whitespace | mr.Shu | 2014-02-25 | 1 | -1/+1 | |
|/ / | ||||||
* | | Test /otr start sends OTR query message to current recipient | James Booth | 2014-02-23 | 7 | -0/+56 | |
| | | ||||||
* | | Added test for /otr start when no key loaded | James Booth | 2014-02-23 | 3 | -0/+20 | |
| | | ||||||
* | | Fixed issue with /otr myfp when no key loaded | James Booth | 2014-02-23 | 6 | -3/+40 | |
| | | ||||||
* | | Added test for /otr start when already in OTR session | James Booth | 2014-02-23 | 3 | -0/+19 | |
| | | ||||||
* | | Added tests for /otr start from non chat windows | James Booth | 2014-02-23 | 3 | -0/+45 | |
| | | ||||||
* | | Merge branch 'master' of github.com:boothj5/profanity | James Booth | 2014-02-23 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Update README.md | James Booth | 2014-02-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Removed redundant bootstrap call for travis build | James Booth | 2014-02-23 | 1 | -1/+0 | |
|/ / | ||||||
* | | Revert "Fail test for travis" | James Booth | 2014-02-23 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit 4c1634610c562751868b4b3245e44a41a2af8d10. | |||||
* | | Fail test for travis | James Booth | 2014-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | Added cmocka to travis build | James Booth | 2014-02-23 | 1 | -0/+10 | |
| | | ||||||
* | | Added custom script to travis build | James Booth | 2014-02-23 | 1 | -0/+1 | |
| | | ||||||
* | | Changed travis libotr dependency | James Booth | 2014-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | Added dependencies to travis build | James Booth | 2014-02-23 | 1 | -1/+13 | |
| | | ||||||
* | | Added bootstrap.sh to travis build | James Booth | 2014-02-23 | 1 | -0/+1 | |
| | | ||||||
* | | Added travis config | James Booth | 2014-02-23 | 1 | -0/+1 | |
| | | ||||||
* | | Show OTR status on /msg usr when usr has already started an OTR session | James Booth | 2014-02-23 | 1 | -0/+5 | |
| | | | | | | | | fixes #308 | |||||
* | | Merge branch 'master' into otr-query | James Booth | 2014-02-23 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | Removed debug on error messages | James Booth | 2014-02-23 | 1 | -1/+0 | |
| |/ | ||||||
* / | Added OTR supported versions in initial start query message | James Booth | 2014-02-18 | 6 | -2/+26 | |
|/ | ||||||
* | Test /otr theirfp | James Booth | 2014-02-17 | 5 | -0/+45 | |
| | ||||||
* | Test for /otr theirfp in non OTR window | James Booth | 2014-02-17 | 5 | -0/+34 | |
| |