1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Commit Graph

2341 Commits

Author SHA1 Message Date
James Booth
38e1ff22fc Merge branch 'master' into plugins 2014-03-16 18:03:15 +00:00
James Booth
f4d52f3d40 Use expect_value == NULL for NULL parameters in tests 2014-03-16 18:02:18 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
bcafba2de6 Added /roster remove tests 2014-03-16 16:00:10 +00:00
James Booth
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +00:00
James Booth
a578419d55 Added /roster add test 2014-03-16 01:46:18 +00:00
James Booth
93397e4581 Added cmd_roster test 2014-03-16 01:23:12 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00:00
James Booth
f7a7277e40 Merge branch 'master' into plugins 2014-03-15 22:28:21 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
3acec2b0be Udated copyright in plugins sources 2014-03-09 01:27:35 +00:00
James Booth
2c7f6c16aa Merge branch 'master' into plugins
Conflicts:
	src/main.c
	src/ui/console.c
2014-03-09 01:22:13 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
a198c9e873 Updated man page 2014-03-09 00:54:41 +00:00
James Booth
006ee8dd02 Removed old DESIGN file 2014-03-09 00:48:45 +00:00
James Booth
2731ef9cd8 Merge branch 'master' into plugins 2014-03-09 00:13:41 +00:00
James Booth
3b1b3f8b16 Merge branch 'brew-build' 2014-03-09 00:06:20 +00:00
James Booth
72c35553fd Split ncurses and curl LIB additions 2014-03-09 00:04:39 +00:00
James Booth
7fa9ecc76d Uncomment ncurses check 2014-03-09 00:02:34 +00:00
James Booth
768df4d736 Ncurses include libs before wget_wch check 2014-03-08 23:57:50 +00:00
James Booth
ea16cacf91 Uncommented ncurses check 2014-03-08 23:52:14 +00:00
James Booth
2b3d645147 Added other osx build options 2014-03-08 23:38:30 +00:00
James Booth
13ee16dedb Revert "Added srdir to git version check"
This reverts commit 864e728705.
2014-03-08 23:34:18 +00:00
James Booth
864e728705 Added srdir to git version check 2014-03-08 23:00:23 +00:00
James Booth
2c976d3523 Commented ncurses wget_wch test 2014-03-08 22:32:54 +00:00
James Booth
c505b03465 Merge branch 'master' into plugins 2014-03-08 21:51:47 +00:00
James Booth
15fce2cf95 Test for password usage on /join 2014-03-08 21:50:55 +00:00
James Booth
baf46c6ae5 Added test for account muc_service usage 2014-03-08 21:45:07 +00:00
James Booth
bafc0f2506 Added test for using account->muc_nick 2014-03-08 21:37:06 +00:00
James Booth
b177250f47 Refactored muc_room_is_active to only take room, rather than full jid 2014-03-08 21:20:26 +00:00
James Booth
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
James Booth
e9b5d3294b Removed unused variables from cmd_join 2014-03-08 18:32:48 +00:00
James Booth
7d332750ce Merge branch 'master' into plugins 2014-03-08 00:24:42 +00:00
James Booth
a94814f0a9 Added invalid jid test for /join 2014-03-08 00:23:52 +00:00
James Booth
2d54c565ce Added test to show usage when no room supplied to /join 2014-03-08 00:19:21 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +00:00
James Booth
b9f3799982 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-03-06 21:43:17 +00:00
James Booth
d683c49b6c Revert "Set package status to brew for osx"
This reverts commit 8ae6f52f10.
2014-03-06 21:38:26 +00:00
James Booth
db39450734 Revert "Do not perform AC_FUNC_MALLOC on OSX"
This reverts commit e7b6d068a0.
2014-03-06 21:37:47 +00:00
James Booth
bc8a871ad9 Revert "Ncurses fixes for brew"
This reverts commit ca0a1e4d9d.
2014-03-06 21:37:46 +00:00
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