3892 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	669237d9f7	Merge branch 'master' into osx-functional	2015-10-14 22:29:21 +01:00
James Booth	fb60a755e5	Updated CHANGELOG	2015-10-14 22:28:06 +01:00
James Booth	b6f91ae284	Merge branch 'master' into osx-functional	2015-10-14 22:10:10 +01:00
James Booth	d38e10828e	Added /lastactivity on|off	2015-10-14 22:09:18 +01:00
James Booth	1fd2a8a4e9	Send service-unavailable when lastactivity disabled	2015-10-14 21:45:19 +01:00
James Booth	5fb8acb17f	Use lastactivity preference for presence updates	2015-10-14 21:30:48 +01:00
James Booth	8c9174b82f	Added lastactivity preference	2015-10-14 21:17:46 +01:00
James Booth	aae526fbde	Moved idle time check for last activity	2015-10-14 21:12:26 +01:00
James Booth	1bebfefa9c	Merge branch 'master' into osx-functional	2015-10-14 01:01:19 +01:00
James Booth	85764ddb53	Added TLS show to UI preferences	2015-10-14 00:58:33 +01:00
James Booth	93358d5e62	Updated themes	2015-10-14 00:53:51 +01:00
James Booth	ef832ce526	Add preference for showing TLS indicator in titlebar ... Issue #616	2015-10-14 00:48:11 +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	56900945fb	Merge branch 'master' into osx-functional	2015-10-13 20:47:48 +01:00
James Booth	ecbcecea7d	Fixed closing room config windows	2015-10-13 20:46:59 +01:00
James Booth	6e0f73d616	Merge pull request #633 from sirdiego/master ... updated intaller to clone libmsode over https	2015-10-13 19:52:04 +01:00
James Booth	36bd583d95	Merge branch 'master' into osx-functional	2015-10-13 19:45:41 +01:00
James Booth	36fe125c65	Merge remote-tracking branch 'halfur/master' into apt-get	2015-10-13 19:34:34 +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	f368c993e3	Merge branch 'master' into osx-functional	2015-10-12 23:38:28 +01:00
James Booth	6e28df66e8	Use libstrophe/libmesode uuid generator	2015-10-12 23:37:11 +01:00
James Booth	fb6e7d1dda	Merge branch 'master' into osx-functional	2015-10-06 23:23:55 +01:00
James Booth	de15d47be4	Fixed resize during password and tls commands	2015-10-06 23:21:47 +01:00
Lennart Bentz	ee8ec99e0f	Add check for existing apt-cyg in cyg_prepare() and extract installation method into separate function cyg_install_apt_cyg()	2015-10-06 20:00:05 +02:00
Tim Spiekerkötter	80b2aa0fad	updated intaller to clone libmsode over https	2015-10-01 15:41:51 +02:00
James Booth	bbb3038129	Merge branch 'master' into osx-functional	2015-09-30 23:24:35 +01:00
James Booth	09cd288186	Updated theme template, changed default lastactivity format	2015-09-30 23:22:39 +01:00
James Booth	06afcb5964	Updated themes	2015-09-30 23:20:29 +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	b9948a4c01	Added time format perferences per window type	2015-09-30 22:34:27 +01:00
James Booth	276367b532	Merge branch 'master' into osx-functional	2015-09-30 00:13:15 +01:00
James Booth	d2b991de1d	Updated CHANGELOG	2015-09-30 00:12:40 +01:00
James Booth	9935df3628	Merge branch 'master' into osx-functional	2015-09-30 00:08:11 +01:00
James Booth	075c108e2d	Fixed spelling	2015-09-30 00:07:35 +01:00
James Booth	497723f918	Merge branch 'master' into osx-functional	2015-09-29 23:55:38 +01:00
James Booth	1afe492e30	Added jabber:iq:last to capabilities	2015-09-29 23:55:01 +01:00
James Booth	2a30e342d7	Merge branch 'master' into osx-functional	2015-09-29 23:30:59 +01:00
James Booth	99fc70bd92	Added last activity time format option	2015-09-29 23:30:23 +01:00
James Booth	ac1164a3fa	Use more specific messages for last activity responses	2015-09-29 21:51:04 +01:00
James Booth	1c023c21db	Merge branch 'master' into osx-functional	2015-09-29 21:14:31 +01:00
James Booth	09833fb0dd	Unmap key sequence Alt+= ... Fixes #629	2015-09-29 21:08:42 +01:00
James Booth	be9b669656	Merge branch 'master' into osx-functional	2015-09-29 00:56:00 +01:00