conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	brought ad hoc conferences back. fixed #688 fixed #367	iNPUTmice	2014-11-20	1	-1/+1
*	synchronized message list in conversation fragment	iNPUTmice	2014-11-18	1	-113/+118
*	properly remove conversations context menu	iNPUTmice	2014-11-18	1	-4/+1
*	better usage of synchronized in some places	iNPUTmice	2014-11-18	1	-1/+1
*	context menu for muc participants + refactor trueCounterpart to use Jid class	iNPUTmice	2014-11-17	1	-0/+3
*	Make account status an enum	Sam Whited	2014-11-15	1	-2/+2
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	1	-1/+26
\|\
\| *	handled more error cases	iNPUTmice	2014-11-15	1	-0/+9
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-1/+2
\| *	made file transfers cancelable	iNPUTmice	2014-11-15	1	-1/+16
* \|	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	1	-66/+59
* \|	initial smp support	iNPUTmice	2014-11-11	1	-9/+7
\|/
*	more refactoring for presence selection. removed getTo, getFrom and getJid fr...	iNPUTmice	2014-11-10	1	-14/+9
*	use isBareJid instead of getResourcePart().isEmpty()	iNPUTmice	2014-11-09	1	-1/+1
*	fixed muc sender history for some cases (where the previous nick was a valid ...	iNPUTmice	2014-11-09	1	-4/+5
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-1/+1
*	refactored code to always contain full jid for counterpart	iNPUTmice	2014-11-09	1	-14/+12
*	Fix contact highlighting in MUC	Sam Whited	2014-11-09	1	-2/+2
*	Update another chunk of stuff to use JID objects	Sam Whited	2014-11-09	1	-9/+8
*	bug fixes for the previous ui refactoring	iNPUTmice	2014-11-07	1	-1/+0
*	UI code refactoring	iNPUTmice	2014-11-07	1	-118/+79
*	link to account details when touching own avatar	iNPUTmice	2014-11-04	1	-118/+124
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-8/+119
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+781