1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

151 Commits

Author SHA1 Message Date
James Booth
27c1b429c1 Merge branch 'master' into plugins 2014-06-15 19:27:48 +01:00
James Booth
f592f61056 Fixed tests for sha1 renaming 2014-06-15 19:27:16 +01:00
James Booth
e263a9e150 Merge branch 'master' into plugins 2014-05-10 00:51:45 +01:00
James Booth
d2662a6f17 Refactored bookmarks to use option parser, allow bookmarking rooms with passwords 2014-05-10 00:50:43 +01:00
James Booth
0fa43596ba Merge branch 'master' into plugins
Conflicts:
	configure.ac
	src/profanity.c
2014-05-02 00:57:15 +01:00
James Booth
524b1f2383 Changed to use gnutls instead of openssl for sha1 hashing 2014-05-01 22:18:04 +01:00
James Booth
94cd4723be Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	configure.ac
	src/ui/titlebar.c
2014-04-21 00:50:54 +01:00
James Booth
2c15aba92a Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00
James Booth
56a9ae6e53 Merge branch 'master' into plugins 2014-04-14 23:44:10 +01:00
James Booth
2419737006 Check for duplicate options in option parser 2014-04-14 23:01:57 +01:00
James Booth
8d77930ece Added parse_options 2014-04-14 22:48:18 +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
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
38e1ff22fc Merge branch 'master' into plugins 2014-03-16 18:03:15 +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
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
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
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
James Booth
396991c191 Fixed merge 2014-02-16 23:15:51 +00:00
James Booth
6e58d95469 Added connection status tests for /otr myfp 2014-02-16 20:15:10 +00:00
James Booth
d1d80fc26b Added connection status tests for /otr gen 2014-02-16 20:09:12 +00:00
James Booth
4eac5c0d43 Test /otr gen 2014-02-16 19:35:40 +00:00
James Booth
e048b3196e Added test for message when no connected /otr gen 2014-02-16 19:20:55 +00:00
James Booth
6ef1174bf4 Refactor test setup and teardown functions 2014-02-16 18:07:41 +00:00