4315 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Vetter	8dfa41ea8e	Remove double declaration and reduce scope of pcontact ... In command/commands.c you declare pcontact at the top of the function. Later in one case you declare it again and use it in a small scope. And in the same function you use it again this time from the first declaration. I think you intended only declaring it one time. At first I thought about top of the function because its easier to find. Then I saw that you declare "Jid jid" not at the top too, and I think for the sake of reducing scope it is better. So I went for this approach.	2015-10-09 10:34:58 +02: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
James Booth	bfdda17b7f	Fix last active query	2015-09-29 00:53:58 +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	3412347e40	Merge branch 'master' into osx-functional	2015-09-28 21:39:59 +01:00
James Booth	a12624ea75	Increased help examples size	2015-09-28 21:39:09 +01:00
James Booth	f861cd95f2	Merge branch 'master' into osx-functional	2015-09-28 21:35:10 +01:00
James Booth	9f4e2c036e	Added contact OTR policy to help	2015-09-28 21:34:27 +01:00
James Booth	9f0124d3d2	Merge branch 'master' into osx-functional	2015-09-28 21:27:03 +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	ddc4d62c5c	Merge branch 'master' into osx-functional	2015-09-28 00:19:25 +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	412f74a325	Merge branch 'master' into osx-functional	2015-09-27 23:58:25 +01:00
James Booth	9593e17c3c	Include last activity in initial presence	2015-09-27 23:53:06 +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	fe22fea9a8	Fixed spelling mistake	2015-09-27 18:32:21 +01:00
James Booth	6f2487c5c1	Tidied autoaway code	2015-09-25 23:29:10 +01:00
James Booth	ca3da5a929	Allow autoaway when status is dnd	2015-09-25 23:04:57 +01:00
James Booth	100db7c36c	Set status to what it was before autoaway	2015-09-25 22:55:44 +01:00
James Booth	22ba3db0b2	Send current presence when autoaway mode idle	2015-09-25 22:08:21 +01:00
James Booth	f7aa03f8e6	Include last activity with autoaway mode away	2015-09-25 21:53:29 +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	a5c6710024	Removed redundant last activity setter	2015-09-25 00:35:08 +01:00
James Booth	b484411ea8	Save last activity to account on disconnect	2015-09-25 00:26:58 +01:00