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	-1/+1
\|\
\| *	keep conference members in memory and show them in conference details	Daniel Gultsch	2016-05-16	1	-1/+1
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-31/+113
\|\\|
\| *	republish avatar if server offers non-persistent pep :-(	Daniel Gultsch	2016-04-11	1	-5/+18
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-15	1	-3/+3
\|\ \
* \| \|	Imports organized	steckbrief	2016-02-12	1	-2/+1
* \| \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-8/+7
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-21/+126
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	when no avatar found show avatar of contact and not the muc user in conferences	Daniel Gultsch	2015-12-09	1	-1/+6
\| * \|	properly clear muc user avatar caches	Daniel Gultsch	2015-12-04	1	-8/+14
\| * \|	fixed showing avatars for contacts in muc	Daniel Gultsch	2015-12-04	1	-1/+10
\| * \|	parse vcard avatars from muc presences	Daniel Gultsch	2015-12-03	1	-7/+43
\| * \|	Own contact picture in tile for conferences with only one other occupant	fiaxh	2015-11-15	1	-20/+48
\| * \|	load avatars in message adapter in background task	Daniel Gultsch	2015-10-29	1	-2/+19
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	1	-6/+7
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	1	-0/+58
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	1	-8/+181
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-22/+19
\|\\| \| \| \|/ \|/\|
\| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-295/+0
\|/
*	loading avatars in seperate tasks	iNPUTmice	2015-02-15	1	-14/+26
*	handle muc nicks with white spaces. fixed #884	iNPUTmice	2015-01-14	1	-1/+2
*	cleaned up avatar / tile creation	iNPUTmice	2014-12-03	1	-20/+6
*	fix for concurrency issue	iNPUTmice	2014-11-29	1	-1/+1
*	brought ad hoc conferences back. fixed #688 fixed #367	iNPUTmice	2014-11-20	1	-1/+1
*	synchronized around cache clear in avatar service	iNPUTmice	2014-11-17	1	-9/+15
*	happy hanukkah	iNPUTmice	2014-11-16	1	-10/+4
*	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-11-09	1	-2/+2
\|\
\| *	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-2/+2
* \|	Merge branch 'master' into development	iNPUTmice	2014-11-09	1	-14/+22
\|\ \ \| \|/ \|/\|
\| *	make avatar service not break on empty names	iNPUTmice	2014-11-09	1	-14/+22
* \|	Create avatar's for JID's w/o localparts	Sam Whited	2014-11-09	1	-3/+3
* \|	Fields that we sync on should be final	Sam Whited	2014-11-09	1	-1/+1
* \|	Update more files to use JID objects	Sam Whited	2014-11-09	1	-1/+1
\|/
*	fixed #617	iNPUTmice	2014-11-05	1	-26/+22
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-6/+0
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+298