conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	fixed regression of xmpp uris not working	iNPUTmice	2014-11-16	1	-3/+3
*	happy hanukkah	iNPUTmice	2014-11-16	1	-0/+7
*	Don't escape passwords in SASL	Sam Whited	2014-11-15	1	-1/+1
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	1	-0/+79
*	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...	iNPUTmice	2014-11-16	1	-0/+9
*	Cache SCRAM-SHA-1 keys for current session	Sam Whited	2014-11-15	1	-0/+4
*	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	1	-34/+0
\|\
\| *	initial smp support	iNPUTmice	2014-11-11	1	-34/+0
* \|	Add SCRAM-SHA1 support	Sam Whited	2014-11-14	1	-2/+29
* \|	Refactor authentication code	Sam Whited	2014-11-12	1	-59/+1
\|/
*	more refactoring for presence selection. removed getTo, getFrom and getJid fr...	iNPUTmice	2014-11-10	1	-0/+2
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	2	-2/+2
*	Update more files to use JID objects	Sam Whited	2014-11-09	2	-13/+16
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-6/+8
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	2	-32/+179
*	Make conversations the root project	Sam Whited	2014-10-22	12	-0/+1289