5198 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	9d3d21479b	Merge branch 'master' into osx-functional	2017-02-02 23:02:19 +00:00
James Booth	b768c8b5c5	Update CHANGELOG	2017-01-28 20:30:33 +00:00
James Booth	1f68415759	Merge branch 'master' into osx-functional	2017-01-28 17:29:41 +00:00
James Booth	68a3daedb9	Update Copyright	2017-01-28 17:24:22 +00:00
James Booth	dfeb588953	Update CHANGELOG	2017-01-28 16:55:09 +00:00
James Booth	86df369836	Merge branch 'master' into osx-functional	2017-01-28 16:42:02 +00:00
James Booth	8978f809f2	Fix alias help ... fixes #899	2017-01-28 16:39:04 +00:00
James Booth	6679b890a0	Fix multibyte chars in prof_occurrences ... issue #901	2017-01-26 00:52:13 +00:00
James Booth	20cd66f3c3	Merge branch 'master' into osx-functional	2017-01-24 13:44:53 +00:00
James Booth	b712820c99	Check barejid in carbons	2017-01-24 13:37:28 +00:00
James Booth	991c502877	Merge branch 'master' into osx-functional	2017-01-23 22:36:28 +00:00
James Booth	8e75437a7e	Add carbons from check	2017-01-23 22:25:36 +00:00
James Booth	c073418306	Check roster contact before displayng typing notification ... fixes #896	2017-01-23 20:56:05 +00:00
James Booth	46edfe30b6	Merge branch 'master' into osx-functional	2017-01-22 21:46:07 +00:00
James Booth	83385cdbc0	Add pre chat and room message blocking	2017-01-22 18:09:04 +00:00
James Booth	7090f85d85	Add chat and room show calls to plugins api	2017-01-21 20:23:28 +00:00
James Booth	79d4ceacca	Merge branch 'master' into osx-functional	2017-01-20 23:53:26 +00:00
James Booth	9cfd17821c	Allow room display properies to be set by plugins	2017-01-20 23:26:14 +00:00
James Booth	c8874cd2e0	Allow chat prefix char to be set by plugins	2017-01-20 21:03:55 +00:00
James Booth	343d73ac19	Merge branch 'master' into osx-functional	2017-01-20 00:31:01 +00:00
James Booth	ab1441a25c	Update CHANGELOG	2017-01-19 23:13:39 +00:00
James Booth	1b25aa84cb	Add titlebar encryption text to plugins api	2017-01-19 22:33:29 +00:00
James Booth	2614fa63f1	Merge branch 'master' into osx-functional	2017-01-19 00:00:07 +00:00
James Booth	68496db0b4	Fix conditional compile	2017-01-18 23:16:23 +00:00
James Booth	fccf56be10	Add prof.encryption_reset to Plugins API ... issue #885	2017-01-18 22:46:29 +00:00
James Booth	80f58444ae	Merge branch 'master' into osx-functional	2017-01-16 00:24:50 +00:00
James Booth	70e831e08b	Fix tests	2017-01-16 00:21:57 +00:00
James Booth	0d0578b625	Fix compile	2017-01-16 00:07:17 +00:00
James Booth	69187b969b	Merge branch 'master' into osx-functional	2017-01-16 00:02:52 +00:00
James Booth	2b7894ccff	Remove status from cl_ev_presence_send ... fixes #888	2017-01-15 23:59:31 +00:00
James Booth	60535bc993	Merge branch 'master' into osx-functional	2016-11-24 00:10:51 +00:00
James Booth	b64646979e	Remove unused function	2016-11-24 00:09:14 +00:00
James Booth	490d16466a	Merge branch 'master' into osx-functional	2016-11-23 00:19:11 +00:00
James Booth	926d935e26	Fix help tags for /account	2016-11-23 00:17:50 +00:00
James Booth	97d57cd8c0	Merge branch 'master' into osx-functional ... Conflicts: tests/functionaltests/proftest.c	2016-11-22 00:42:50 +00:00
James Booth	e043029a50	Allow clearing account resource ... issue #880	2016-11-22 00:39:52 +00:00
James Booth	1f30da1942	Merge branch 'master' into osx-functional	2016-11-20 02:22:59 +00:00
James Booth	c441dbfa42	Fix typo	2016-11-20 02:21:22 +00:00
James Booth	095cedb763	Merge branch 'master' into osx-functional	2016-11-20 02:19:26 +00:00
James Booth	609d05366c	Use server features for account muc service ... issue #878	2016-11-20 02:09:34 +00:00
James Booth	6e5184dfd4	Merge branch 'master' into osx-functional	2016-11-07 00:24:44 +00:00
James Booth	44979ac754	Update CHANGELOG	2016-11-06 23:09:00 +00:00
James Booth	24f3ad143c	Merge remote-tracking branch 'origin/master'	2016-11-06 23:02:02 +00:00
James Booth	8008d8c3c6	Add get_room_nick to plugins api	2016-11-06 23:01:16 +00:00
James Booth	d88878d32f	Update CHANGELOG	2016-11-06 22:34:07 +00:00
James Booth	9dbfa784d6	Merge remote-tracking branch 'origin/master' into osx-functional	2016-10-30 17:24:33 +00:00
James Booth	ffa01a1a4c	Add main.help.header to themes	2016-10-30 17:06:06 +00:00
James Booth	9516049e28	Merge remote-tracking branch 'lactide/master'	2016-10-30 16:50:44 +00:00
Frank Zschockelt	c0f099cb84	Added main.help.header theme option	2016-10-29 18:19:12 +02:00
James Booth	eac6b52e05	Fix typo	2016-10-29 13:06:50 +01:00