523 Commits

Author	SHA1	Message	Date
James Booth	d2cc99a4f2	Merge branch 'master' into osx-functional	2015-10-26 20:54:56 +00:00
James Booth	2f68063aca	Merge remote-tracking branch 'jubalh/resleak'	2015-10-26 20:50:51 +00:00
James Booth	d8fc7faa36	Removed ui_about() function	2015-10-26 20:37:50 +00:00
Michael Vetter	9b5cdf8ebd	Fix resource leak ... Run fclose after fopen in unittests.	2015-10-26 14:30:26 +01:00
James Booth	67d57ba908	Merge branch 'master' into osx-functional	2015-10-26 01:05:31 +00:00
James Booth	1d4d693a53	Merge remote-tracking branch 'jubalh/jub'	2015-10-24 21:42:04 +01:00
Michael Vetter	7a0e8f87b5	Remove trailing whitespaces	2015-10-21 15:07:58 +02:00
James Booth	7361760ca2	Merge branch 'master' into osx-functional	2015-10-19 00:57:51 +01:00
James Booth	496616256e	Fixed test_cmd_rooms.c	2015-10-19 00:57:01 +01: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	9d2745e462	Removed --disable-tls command line option	2015-10-18 00:17:45 +01:00
James Booth	cb33ae13fc	Merge branch 'master' into osx-functional	2015-10-17 23:15:49 +01:00
James Booth	eca7390951	Implemented /script show	2015-10-17 22:58:45 +01:00
James Booth	a35cbea732	Implemented /script list	2015-10-17 22:30:01 +01:00
James Booth	e60b4d1946	Merge branch 'master' into osx-functional	2015-10-15 01:23:14 +01:00
James Booth	904a5a81cf	Add ability to script commands after connect	2015-10-15 01:19:24 +01:00
James Booth	5d1dc99872	Merge branch 'master' into osx-functional	2015-10-14 00:31:19 +01:00
James Booth	c9165ef9d2	Title bar TLS indicator ... Issue #616	2015-10-14 00:29:22 +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	a61d95f45b	Merge branch 'master' into osx-functional	2015-10-12 23:44:36 +01:00
James Booth	164620f4bb	Fixed tests	2015-10-12 23:44:03 +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	bb8a83a152	Merge branch 'master' into osx-functional	2015-09-29 00:02:19 +01:00
James Booth	26d160cae8	WIP: Added last activity request and response	2015-09-29 00:01:38 +01:00
James Booth	78c5b64ab5	Merge branch 'master' into osx-functional	2015-09-27 23:12:20 +01:00
James Booth	54e225aa53	Added auto xa option, tidied autoaway code	2015-09-27 23:08:30 +01:00
James Booth	100db7c36c	Set status to what it was before autoaway	2015-09-25 22:55:44 +01:00
James Booth	95195fceee	Merge branch 'master' into osx-functional	2015-09-25 00:37:49 +01:00
James Booth	c5178747fd	Fixed test	2015-09-25 00:36:20 +01:00
James Booth	b484411ea8	Save last activity to account on disconnect	2015-09-25 00:26:58 +01:00
James Booth	966da3b45f	Merge branch 'master' into osx-functional	2015-09-24 20:20:59 +01:00
James Booth	9414ad268d	Prompt user to allow or deny untrusted TLS certificates	2015-09-22 21:42:05 +01:00
James Booth	94b685d692	Merge branch 'master' into osx-functional	2015-09-08 20:21:55 +01:00
James Booth	b266e4d035	Pass delay timestamp to all incoming chat events	2015-09-08 20:18:31 +01:00
James Booth	0a2df8ae89	Merge branch 'master' into osx-functional	2015-08-30 02:13:03 +01:00
James Booth	688be91c23	PGP: Format fingerprints	2015-08-30 02:12:05 +01:00
James Booth	816274457e	Merge branch 'master' into osx-functional	2015-08-30 01:37:33 +01:00
James Booth	b4722632b6	Split PGP incoming and outgoing message handling	2015-08-30 01:32:13 +01:00
James Booth	d7b56a468d	Merge branch 'master' into osx-functional	2015-08-27 00:42:27 +01:00
James Booth	1484e94b35	Fixed OTR decryption check	2015-08-27 00:37:48 +01:00
James Booth	ef52840d91	Added str_contains_str to common	2015-08-26 23:52:40 +01:00
James Booth	9e9d31cbac	Merge branch 'master' into osx-functional	2015-08-26 01:38:14 +01:00
James Booth	4625651340	Fixed test stubs	2015-08-26 00:45:09 +01:00
James Booth	cb19be2ffc	Added PGP key autocompleter	2015-08-25 23:44:03 +01:00