84 Commits

Author	SHA1	Message	Date
James Booth	97d57cd8c0	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/proftest.c	2016-11-22 00:42:50 +00:00
James Booth	e043029a50	Allow clearing account resource ... issue #880	2016-11-22 00:39:52 +00:00
James Booth	095cedb763	Merge branch 'master' into osx-functional	2016-11-20 02:19:26 +00:00
James Booth	609d05366c	Use server features for account muc service ... issue #878	2016-11-20 02:09:34 +00:00
James Booth	8e94debd27	Merge branch 'master' into osx-functional	2016-09-26 00:55:39 +01:00
James Booth	388a20813c	Tests: disable occupants panel in functional tests	2016-09-26 00:39:37 +01:00
James Booth	e78684f689	Tests: longer timeout for failing functional test on travis	2016-09-26 00:16:12 +01:00
James Booth	98b77fa6d2	Merge branch 'master' into osx-functional ... Conflicts: .travis.yml tests/functionaltests/functionaltests.c	2016-09-03 23:12:18 +01:00
James Booth	fca59a3110	log_info on private carbons	2016-08-28 17:27:26 +01:00
James Booth	b6ab90124b	Merge branch 'master' into osx-functional	2016-08-18 22:56:12 +01:00
James Booth	a978bb12bf	Send receipt request only when receiver supports feature ... issue #829	2016-08-18 22:53:23 +01:00
James Booth	449df00e1e	Merge branch 'master' into osx-functional	2016-05-01 20:25:36 +01:00
James Booth	b8c94376aa	Add /blocked command	2016-05-01 19:39:39 +01:00
James Booth	aa9104644a	Merge branch 'master' into osx-functional	2016-04-27 00:41:15 +01:00
James Booth	167553ae8f	Fixed functional test ID based stubs	2016-04-26 23:50:55 +02:00
James Booth	c5e26526c8	Merge branch 'master' into osx-functional	2016-03-31 21:05:20 +01:00
James Booth	9b177a9e01	Removed #AX_PREFIX_CONFIG_H	2016-03-31 21:05:02 +01:00
James Booth	8e15527079	Merge branch 'master' into osx-functional ... Conflicts: .travis.yml	2016-02-24 00:10:37 +00:00
James Booth	41fe8c22b1	Added C plugin code from plugins branch	2016-02-14 22:28:55 +00:00
James Booth	79674fd16c	Merge branch 'master' into osx-functional	2016-01-05 01:35:07 +00:00
James Booth	e1e0fda8b3	Call UI disconnect functions before disconnecting with /disconnect ... fixes #703	2016-01-05 01:30:32 +00:00
James Booth	43b1329b48	Merge branch 'master' into osx-functional	2015-12-30 00:37:55 +00:00
James Booth	69ac809776	Added functional tests for /console command	2015-12-30 00:32:52 +00:00
James Booth	7f98e013e1	Use single quotes in functional test stanzas	2015-12-30 00:12:24 +00:00
James Booth	c963ac3bb2	Merge branch 'master' into osx-functional	2015-12-22 00:46:09 +00:00
James Booth	377a63d038	Uncommented functional tests	2015-12-22 00:45:15 +00:00
James Booth	6303e0e25a	Added chat message functional tests	2015-12-22 00:27:37 +00:00
James Booth	16b51dbb0f	Merge branch 'master' into osx-functional	2015-12-20 23:28:40 +00:00
James Booth	d9f5a2bda6	Updated console new message text	2015-12-20 23:26:05 +00:00
James Booth	1b88b5706e	Change console incoming message text to include "win"	2015-12-20 22:50:03 +00:00
James Booth	4068f1ec1c	Merge branch 'master' into osx-functional	2015-12-20 03:11:55 +00:00
James Booth	94169705b5	Added functional test for muc console message	2015-12-20 03:11:02 +00:00
James Booth	73d1c4c1d5	Merge branch 'master' into osx-functional	2015-12-20 02:57:57 +00:00
James Booth	9f34373b46	Disable muc notifications for functional tests	2015-12-20 02:57:01 +00:00
James Booth	fabfeed6da	Merge branch 'master' into osx-functional	2015-12-20 02:52:42 +00:00
James Booth	c61e9d80ea	Added more muc functional tests	2015-12-20 02:42:11 +00:00
James Booth	46a0e6ebed	Removed whitespace	2015-12-20 02:17:17 +00:00
James Booth	87b4d7cbab	Added muc functional tests	2015-12-20 02:13:01 +00:00
James Booth	8580bb048e	Merge branch 'master' into osx-functional	2015-11-29 00:45:31 +00:00
James Booth	cadaf73148	Fixed functional tests	2015-11-29 00:16:00 +00:00
James Booth	d4a60a268a	Merge branch 'master' into osx-functional	2015-10-18 03:11:18 +01:00
James Booth	6640a0891f	Force tls on all connections, add tls policy account property	2015-10-18 03:06:23 +01:00
James Booth	e6fd9f8a7b	Merge branch 'master' into osx-functional	2015-10-13 00:50:41 +01:00
James Booth	9c08211119	functionaltests: user ip address for server on connect	2015-10-13 00:45:10 +01:00
James Booth	118e92039e	functionaltests: reset connect wait to 30 secs	2015-10-13 00:32:02 +01:00
James Booth	14ff1db9a6	functionaltests: Doubled libexpect timeout for connect	2015-10-13 00:24:28 +01:00
James Booth	e7b4f0bd78	Doubled expect timeout for connect in tests, removed libuuid from travis build	2015-10-13 00:10:28 +01:00
James Booth	c61388d517	Merge branch 'master' into osx-functional	2015-09-30 22:54:34 +01:00
James Booth	e9aff68947	Fixed functional tests	2015-09-30 22:42:42 +01:00
James Booth	cc6f36e253	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/proftest.c	2015-08-06 01:58:48 +01:00