conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-8/+8
\|\
\| *	removed unused config variables	Daniel Gultsch	2016-04-27	1	-3/+1
\| *	expert setting to manually change presence	Daniel Gultsch	2016-04-22	1	-5/+8
* \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-0/+13
\|\\|
\| *	optionally lock conference domains as well and hide known domains in ui	Daniel Gultsch	2016-02-24	1	-0/+13
* \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-5/+11
\|\\|
\| *	set bookmark name to room subject if no subject has been set before	Daniel Gultsch	2015-12-11	1	-0/+10
\| *	added missing type='submit' to mam queries	Daniel Gultsch	2015-09-15	1	-7/+3
\| *	provide helper function for getting the content of a child directly	Daniel Gultsch	2015-05-20	1	-12/+2
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-12/+2
* \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	1	-0/+7
\|/
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-1/+0
*	migrated more jid parsing to use getAttributeAsJid. added error logging	iNPUTmice	2014-12-15	1	-10/+1
*	very basic mam support	iNPUTmice	2014-12-10	1	-3/+1
*	further npe checks	iNPUTmice	2014-12-03	1	-1/+2
*	Use `Locale.US' for string comparisons in search	Sam Whited	2014-11-17	1	-3/+7
*	made tags searchable	iNPUTmice	2014-11-16	1	-38/+55
*	happy hanukkah	iNPUTmice	2014-11-16	1	-0/+7
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-12/+18
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+137