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

220 Commits

Author SHA1 Message Date
James Booth
0a90047bf7 Merge branch 'master' into plugins 2014-04-12 15:38:16 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected" 
This reverts commit e97ec56fce.
 2014-04-12 15:20:19 +01:00
James Booth
45feaefa71 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
 2014-04-09 22:48:01 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
James Booth
7403353da7 Merge branch 'master' into plugins 2014-04-02 22:53:35 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
5929d8450c Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
	src/server_events.c
 2014-04-02 00:01:43 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
7113b97952 Added test for valid window switch 2014-04-01 23:33:12 +01:00
James Booth
96e32fe178 Added cmd_win test 2014-04-01 23:14:53 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
d97a7dc670 Merge branch 'master' into plugins 2014-03-16 18:12:56 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
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
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
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
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
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
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
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
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
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
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
James Booth
b4b463998b Test for /otr theirfp in non OTR window 2014-02-17 22:57:36 +00:00
James Booth
a25714b6dc Added test for /otr theirfp when in other non chat windows 2014-02-17 22:44:27 +00:00
James Booth
4afec6ab5e Added test for /otr theirfp when in console 2014-02-17 22:14:33 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
83e9bef487 Fixed config includes 2014-02-16 23:26:40 +00:00