4621 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	79d9633b1f	Merge branch 'master' into plugins	2015-10-13 19:45:23 +01:00
James Booth	36fe125c65	Merge remote-tracking branch 'halfur/master' into apt-get	2015-10-13 19:34:34 +01:00
James Booth	008c40d1c1	Merge branch 'master' into plugins ... Conflicts: .travis.yml	2015-10-13 00:50:26 +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	162b5eb6f7	Merge branch 'master' into plugins	2015-10-12 23:44:26 +01:00
James Booth	164620f4bb	Fixed tests	2015-10-12 23:44:03 +01:00
James Booth	c68985bae0	Merge branch 'master' into plugins	2015-10-12 23:38:04 +01:00
James Booth	6e28df66e8	Use libstrophe/libmesode uuid generator	2015-10-12 23:37:11 +01:00
James Booth	85b32f88b4	Merge branch 'master' into plugins	2015-10-06 23:23:43 +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
James Booth	bddf966ece	Merge branch 'master' into plugins	2015-09-30 23:24:23 +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	a0c1e88828	Merge branch 'master' into plugins	2015-09-30 22:54:22 +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	0345e71ac6	Merge branch 'master' into plugins	2015-09-30 00:13:00 +01:00
James Booth	d2b991de1d	Updated CHANGELOG	2015-09-30 00:12:40 +01:00
James Booth	5385fe8098	Merge branch 'master' into plugins	2015-09-30 00:07:54 +01:00
James Booth	075c108e2d	Fixed spelling	2015-09-30 00:07:35 +01:00
James Booth	8f660fff6a	Merge branch 'master' into plugins	2015-09-29 23:55:22 +01:00
James Booth	1afe492e30	Added jabber:iq:last to capabilities	2015-09-29 23:55:01 +01:00
James Booth	83a938c3bd	Merge branch 'master' into plugins	2015-09-29 23:30:42 +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	56c0f273f9	Merge branch 'master' into plugins	2015-09-29 21:14:08 +01:00
James Booth	09833fb0dd	Unmap key sequence Alt+= ... Fixes #629	2015-09-29 21:08:42 +01:00
James Booth	4a590e5ac9	Merge branch 'master' into plugins	2015-09-29 00:55:50 +01:00
James Booth	bfdda17b7f	Fix last active query	2015-09-29 00:53:58 +01:00
James Booth	f968a9afeb	Merge branch 'master' into plugins	2015-09-29 00:02:03 +01:00
James Booth	26d160cae8	WIP: Added last activity request and response	2015-09-29 00:01:38 +01:00
James Booth	e4005de0a0	Merge branch 'master' into plugins	2015-09-28 21:39:43 +01:00
James Booth	a12624ea75	Increased help examples size	2015-09-28 21:39:09 +01:00
James Booth	7132dd8781	Merge branch 'master' into plugins	2015-09-28 21:34:47 +01:00
James Booth	9f4e2c036e	Added contact OTR policy to help	2015-09-28 21:34:27 +01:00
James Booth	f641408a1f	Merge branch 'master' into plugins	2015-09-28 21:26:48 +01:00
James Booth	0b03f72b2c	Added missing account properties to /account rename	2015-09-28 21:24:49 +01:00
James Booth	16103f6cc7	Removed old code to fix legacy accounts	2015-09-28 20:42:59 +01:00
James Booth	483a682594	Merge branch 'master' into plugins	2015-09-28 00:19:13 +01:00
James Booth	12ae21ccb6	Updated CHANGELOG	2015-09-28 00:18:50 +01:00
James Booth	a09c707d54	Updated CHANGELOG	2015-09-28 00:18:12 +01:00
James Booth	17e435dfaf	Merge branch 'master' into plugins ... Conflicts: src/xmpp/roster.c	2015-09-27 23:58:11 +01:00
James Booth	9593e17c3c	Include last activity in initial presence	2015-09-27 23:53:06 +01:00
James Booth	c55c16ac48	Merge branch 'master' into plugins	2015-09-27 23:10:27 +01:00
James Booth	54e225aa53	Added auto xa option, tidied autoaway code	2015-09-27 23:08:30 +01:00
James Booth	fe22fea9a8	Fixed spelling mistake	2015-09-27 18:32:21 +01:00