about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' into opensuseJames Booth2014-03-068-41/+41
|\
| * Merge remote-tracking branch 'pasis/gitversion'James Booth2014-03-068-41/+41
| |\
| | * fixed build error when make run with -jN optionDmitry Podgorny2014-03-068-41/+41
| |/
* | Merge branch 'master' into opensuseJames Booth2014-03-057-24/+99
|\|
| * Added autocompeleter for /join optionsJames Booth2014-03-051-8/+37
| * Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs'James Booth2014-03-057-16/+62
| |\
| | * Ensuring nick is set when not included in opt args for cmd_joinKristofer M White2014-03-051-2/+3
| | * Removing extra `nick = ` line that broke nick assignmentKristofer M White2014-03-051-1/+1
| | * Removing strdup calls per cmd_connect designKristofer M White2014-03-051-4/+4
| | * Parsing optional args for cmd_joinKristofer M White2014-03-052-12/+37
| | * Making whitespace consistently spaces, not tabsKristofer M White2014-02-271-1/+1
| | * Adding password handling for joining chatroomsKristofer M White2014-02-276-8/+27
| | * Updating cmd descriptionKristofer M White2014-02-251-3/+4
* | | Merge branch 'master' into opensuseJames Booth2014-03-053-12/+59
|\| |
| * | Merge branch 'osx-notify'James Booth2014-03-052-7/+56
| |\ \
| | * | Added configure checks to enable desktop notifications on OSXJames Booth2014-03-042-7/+32
| | * | Log message when cannot send desktop noficationJames Booth2014-03-041-1/+5
| | * | Added OSX desktop notifications using terminal-notifierJames Booth2014-03-041-0/+20
| * | | Fixed spelling mistake in configure.acJames Booth2014-03-051-1/+1
| * | | Removed gcc linking from cygwin installJames Booth2014-03-041-2/+0
| * | | Added libgcrypt-devel to cygwin dependenciesJames Booth2014-03-041-2/+2
| |/ /
* | | Changes to get install-all.sh working on fresh opensuse VMJames Booth2014-02-252-3/+4
* | | Merge remote-tracking branch 'william20111/master' into opensuseJames Booth2014-02-251-0/+14
|\ \ \ | |/ / |/| |
| * | Added opensuse support for the install. Now getting an error relatingwilliam2014-02-211-0/+14
* | | Merge pull request #309 from mrshu/install-fixJames Booth2014-02-252-20/+32
|\ \ \ | |_|/ |/| |
| * | fixed indent in Makefile.ammr.Shu2014-02-251-18/+18
| * | added error tracingmr.Shu2014-02-251-1/+13
| * | cleaned whitespacemr.Shu2014-02-251-1/+1
|/ /
* | Test /otr start sends OTR query message to current recipientJames Booth2014-02-237-0/+56
* | Added test for /otr start when no key loadedJames Booth2014-02-233-0/+20
* | Fixed issue with /otr myfp when no key loadedJames Booth2014-02-236-3/+40
* | Added test for /otr start when already in OTR sessionJames Booth2014-02-233-0/+19
* | Added tests for /otr start from non chat windowsJames Booth2014-02-233-0/+45
* | Merge branch 'master' of github.com:boothj5/profanityJames Booth2014-02-231-1/+1
|\ \
| * | Update README.mdJames Booth2014-02-231-1/+1
* | | Removed redundant bootstrap call for travis buildJames Booth2014-02-231-1/+0
|/ /
* | Revert "Fail test for travis"James Booth2014-02-231-1/+1
* | Fail test for travisJames Booth2014-02-231-1/+1
* | Added cmocka to travis buildJames Booth2014-02-231-0/+10
* | Added custom script to travis buildJames Booth2014-02-231-0/+1
* | Changed travis libotr dependencyJames Booth2014-02-231-1/+1
* | Added dependencies to travis buildJames Booth2014-02-231-1/+13
* | Added bootstrap.sh to travis buildJames Booth2014-02-231-0/+1
* | Added travis configJames Booth2014-02-231-0/+1
* | Show OTR status on /msg usr when usr has already started an OTR sessionJames Booth2014-02-231-0/+5
* | Merge branch 'master' into otr-queryJames Booth2014-02-231-1/+0
|\ \
| * | Removed debug on error messagesJames Booth2014-02-231-1/+0
| |/
* / Added OTR supported versions in initial start query messageJames Booth2014-02-186-2/+26
|/
* Test /otr theirfpJames Booth2014-02-175-0/+45
* Test for /otr theirfp in non OTR windowJames Booth2014-02-175-0/+34