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,400 Commits 32 Branches 59 Tags 24 MiB
0a90047bf7
Commit Graph

2400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Booth
1588106e91 Revert "More ncurses fixes for brew" 
This reverts commit 5817b07ee3.
 2014-03-06 21:37:40 +00:00
James Booth
5817b07ee3 More ncurses fixes for brew 2014-03-06 21:32:36 +00:00
James Booth
ca0a1e4d9d Ncurses fixes for brew 2014-03-06 21:21:54 +00:00
James Booth
e7b6d068a0 Do not perform AC_FUNC_MALLOC on OSX 2014-03-06 20:51:22 +00:00
James Booth
8ae6f52f10 Set package status to brew for osx 2014-03-06 20:48:44 +00:00
James Booth
c51cc954d8 Moved platform check in configure.ac 2014-03-06 20:45:35 +00:00
James Booth
1d476c35ff Merge branch 'master' into plugins 2014-03-06 20:08:10 +00:00
James Booth
b6ceabdc8e Merge branch 'plugins' of github.com:boothj5/profanity into plugins 
Conflicts:
	.travis.yml
	Makefile.am
 2014-03-06 19:52:05 +00:00
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
89a35677bd Merge branch 'master' into opensuse 2014-03-06 19:12:30 +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
9933db60c4 Merge branch 'master' into opensuse 2014-03-05 21:02:03 +00:00
James Booth
0e9d4f1cc6 Merge branch 'master' into plugins 2014-03-05 21:01:13 +00: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
702600d300 Merge branch 'master' into opensuse 2014-03-05 00:15:20 +00:00
James Booth
8d464e9916 Fixed previous merge 2014-03-05 00:14:43 +00:00
James Booth
02ef4d31be Merge branch 'master' into plugins 2014-03-05 00:14:14 +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
5b734156a5 Changes to get install-all.sh working on fresh opensuse VM 2014-02-25 22:50:25 +00:00
James Booth
a0df7f7944 Merge remote-tracking branch 'william20111/master' into opensuse 2014-02-25 22:47:19 +00:00
James Booth
57a1182eb0 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
 2014-02-25 20:34:54 +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
56bbc7e664 Merge branch 'master' into plugins 2014-02-23 21:22:01 +00: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
793e9acfcb Attempt to fix lua build on travis 2014-02-23 15:10:39 +00:00
James Booth
2c385d9c13 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
 2014-02-23 04:41:28 +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