3508 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	10a5f29023	Merge branch 'master' into openpgp	2015-06-14 00:02:00 +01:00
James Booth	e50461a897	Set columns when running functional tests	2015-06-13 23:59:33 +01:00
James Booth	82ff85c329	Revert back to original rooms test	2015-06-13 22:13:01 +01:00
James Booth	eb676262f9	Travis build fix	2015-06-13 22:02:10 +01:00
James Booth	6e04ce8e13	Output test log in travis build	2015-06-13 21:37:18 +01:00
James Booth	dda79aed24	Debugging travis build	2015-06-13 21:31:38 +01:00
James Booth	5b58e2d0bc	Debugging travis build	2015-06-13 21:20:13 +01:00
James Booth	5c13f00e2f	Debugging travis build	2015-06-13 21:13:21 +01:00
James Booth	0fcfa65f15	Use regex for multiline assert in rooms functional test	2015-06-13 20:53:51 +01:00
James Booth	0c3fe51799	Changed assert order in rooms test	2015-06-13 20:10:12 +01:00
James Booth	b07a7035df	Merge branch 'master' into openpgp	2015-06-13 19:50:53 +01:00
James Booth	6255420b80	Increase connection time, functional tests	2015-06-13 19:49:26 +01:00
James Booth	eb1f8a499a	Merge branch 'master' into openpgp	2015-06-13 19:41:34 +01:00
James Booth	a48b9fcec2	Tidied functional tests	2015-06-13 19:41:11 +01:00
James Booth	0ef00e87ab	Merge branch 'master' into openpgp	2015-06-13 16:27:20 +01:00
James Booth	698288ab5c	Show message when offline for /pgp fps	2015-06-13 01:19:56 +01:00
James Booth	e0783e20db	Renamed otr trusted window property	2015-06-13 01:13:56 +01:00
James Booth	a408ca7326	Removed TODO in gpg.c	2015-06-13 00:35:53 +01:00
James Booth	718967e90d	Merge branch 'master' into openpgp	2015-06-13 00:35:30 +01:00
James Booth	362c1d81ae	Added codelite commands file to .gitignore	2015-06-13 00:34:36 +01:00
James Booth	c2c2cee6c9	Moved stub_gpg.c	2015-06-12 23:58:44 +01:00
James Booth	efb07f8187	Merge branch 'master' into openpgp	2015-06-12 23:55:28 +01:00
James Booth	68ed20f10d	Moved all tests to tests folder	2015-06-12 23:53:30 +01:00
James Booth	1cd23e0efc	Moved gpg stub	2015-06-12 23:27:39 +01:00
James Booth	d8405cd11f	Merge branch 'master' into openpgp	2015-06-12 23:08:43 +01:00
James Booth	c182f3ecd6	Added temp config files to gitignore	2015-06-12 23:05:30 +01:00
James Booth	bc2a8b0409	Merge branch 'master' into openpgp	2015-06-12 22:55:00 +01:00
James Booth	b1375328df	Tidied .gitignore	2015-06-12 22:46:52 +01:00
James Booth	6ecc93bb16	Merge branch 'master' into openpgp	2015-06-08 21:27:31 +01:00
James Booth	05be60820f	Changed log level to DEBUG for stabber functional tests	2015-06-08 20:53:41 +01:00
James Booth	abcf67044c	Merge branch 'master' into openpgp	2015-06-08 20:33:03 +01:00
James Booth	549fceaa7f	Set default autoaway mode to off ... fixes #555	2015-06-08 20:26:23 +01:00
James Booth	cac206f427	Merge branch 'master' into openpgp	2015-06-07 19:15:59 +01:00
James Booth	81522a7516	Specify log level when starting stabber, functional tests	2015-06-07 19:14:42 +01:00
James Booth	6e5ea13691	Merge branch 'master' into openpgp	2015-06-07 03:13:20 +01:00
James Booth	9f3497bffd	Disable desktop notifications for functional tests	2015-06-07 03:12:40 +01:00
James Booth	cdfe486fa8	Merge branch 'master' into openpgp	2015-06-07 02:42:58 +01:00
James Booth	fee6fea001	Added profanity timeout settings to functional tests	2015-06-07 02:41:54 +01:00
James Booth	ed2d87d764	Merge branch 'master' into openpgp	2015-06-07 02:13:07 +01:00
James Booth	046da191c8	Moved stbbr_stop call in functional tests	2015-06-07 02:07:09 +01:00
James Booth	e8095a1b96	Merge branch 'master' into openpgp	2015-06-06 23:07:44 +01:00
James Booth	0e5dc6d89b	Close profanity in functional test hook	2015-06-06 23:07:06 +01:00
James Booth	91767e6090	Merge branch 'master' into openpgp	2015-06-06 01:03:19 +01:00
James Booth	c6ff761a95	Added chat session functional tests	2015-06-06 01:02:27 +01:00
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +01:00
James Booth	ae4e07ad87	Show notice message only when stabber not found	2015-06-05 22:54:10 +01:00
James Booth	78a4446023	Merge branch 'master' into stabber-tests	2015-06-02 20:32:15 +01:00
James Booth	a3693cfbe7	Merge branch 'master' into openpgp	2015-06-02 20:32:07 +01:00
James Booth	f0f3a739f4	Merge remote-tracking branch 'PMaynard/#551'	2015-06-02 20:29:35 +01:00
James Booth	f278e0a466	Use stbbr_for_query for roster	2015-06-02 00:41:50 +01:00