aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
2,267 Commits 32 Branches 59 Tags 24 MiB
917a0c7867
Commit Graph

2267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Booth
917a0c7867 Merge remote-tracking branch 'origin/master' into plugins 
Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
 2014-03-06 19:46:53 +00:00
James Booth
435619f26a Merge remote-tracking branch 'pasis/gitversion' 2014-03-06 19:12:01 +00:00
Dmitry Podgorny
0fbaa6f5ee fixed build error when make run with -jN option 
Race can occur when gitversion file isn't fully generated before
it is used.
 2014-03-06 02:06:22 +02:00
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
James Booth
65432c8d64 Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs' 2014-03-05 20:29:41 +00:00
Kristofer M White
7c6755b62c Ensuring nick is set when not included in opt args for cmd_join 2014-03-05 19:55:02 +00:00
Kristofer M White
3f18d933ca Removing extra nick = line that broke nick assignment 2014-03-05 17:39:44 +00:00
Kristofer M White
a4e2809756 Removing strdup calls per cmd_connect design 2014-03-05 17:25:26 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
James Booth
d68c594150 Merge branch 'osx-notify' 2014-03-05 00:11:50 +00:00
James Booth
4d00f788e9 Fixed spelling mistake in configure.ac 2014-03-05 00:11:18 +00:00
James Booth
a14c42a32a Removed gcc linking from cygwin install 2014-03-04 23:57:57 +00:00
James Booth
3f9ca603ae Added libgcrypt-devel to cygwin dependencies 2014-03-04 23:42:43 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
3f73a55cb0 Log message when cannot send desktop nofication 2014-03-04 20:16:47 +00:00
James Booth
8cfbb72337 Added OSX desktop notifications using terminal-notifier 
Requires Xcode
WIP - No configure.ac changes
 2014-03-04 20:01:19 +00:00
Kristofer M White
ced6e7f411 Making whitespace consistently spaces, not tabs 2014-02-27 05:40:31 +00:00
Kristofer M White
8a54c5895d Adding password handling for joining chatrooms 2014-02-27 05:31:10 +00:00
James Booth
a9980621dc Merge pull request #309 from mrshu/install-fix 
Install fix
 2014-02-25 20:12:44 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
mr.Shu
0d15c7108d fixed indent in Makefile.am 2014-02-25 16:51:24 +01:00
mr.Shu
611d544531 added error tracing 2014-02-25 16:47:45 +01:00
mr.Shu
ea681c7f52 cleaned whitespace 2014-02-25 16:36:19 +01:00
James Booth
c00376087f Test /otr start sends OTR query message to current recipient 2014-02-23 21:20:41 +00:00
James Booth
da058359ac Added test for /otr start when no key loaded 2014-02-23 21:02:02 +00:00
James Booth
18e0884f5f Fixed issue with /otr myfp when no key loaded 2014-02-23 20:34:27 +00:00
James Booth
d25245a286 Added test for /otr start when already in OTR session 2014-02-23 20:17:45 +00:00
James Booth
1f78d5b582 Added tests for /otr start from non chat windows 2014-02-23 20:09:00 +00:00
James Booth
5307b92821 Merge branch 'master' of github.com:boothj5/profanity 2014-02-23 04:40:12 +00:00
James Booth
04fee7f723 Removed redundant bootstrap call for travis build 2014-02-23 04:39:48 +00:00
James Booth
6b69ad578f Update README.md 2014-02-23 04:27:14 +00:00
James Booth
9e57625609 Added autoconf-archive to travis build 2014-02-23 03:35:20 +00:00
James Booth
22e330c3f2 Merge branch 'master' into plugins 2014-02-23 03:32:53 +00:00
James Booth
e4120e144c Revert "Fail test for travis" 
This reverts commit 4c1634610c.
 2014-02-23 03:22:56 +00:00
James Booth
4c1634610c Fail test for travis 2014-02-23 03:20:12 +00:00
James Booth
c9a45d4d9d Added cmocka to travis build 2014-02-23 03:17:25 +00:00
James Booth
9489c4f0fa Added custom script to travis build 2014-02-23 03:08:02 +00:00
James Booth
d292cd014e Changed travis libotr dependency 2014-02-23 03:05:05 +00:00
James Booth
e5787b9504 Added dependencies to travis build 2014-02-23 03:03:29 +00:00
James Booth
24784d9ea6 Added bootstrap.sh to travis build 2014-02-23 02:56:14 +00:00
James Booth
9d707fe0a6 Added travis config 2014-02-23 02:53:18 +00:00
James Booth
b86164d70b Merge branch 'master' into plugins 2014-02-23 01:19:33 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session 
fixes #308
 2014-02-23 01:17:03 +00:00
James Booth
b529dffaaf Merge branch 'master' into plugins 2014-02-23 00:55:41 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
e9b6e277fa Merge branch 'master' into plugins 2014-02-23 00:49:19 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +00:00
James Booth
f4f1167188 Merge branch 'master' into plugins 2014-02-17 23:10:36 +00:00
James Booth
037ca81821 Test /otr theirfp 2014-02-17 23:10:00 +00:00