conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	verify contacts key only on initiating side of smp	iNPUTmice	2014-11-21	1	-3/+7
\|
*	Don't escape passwords in SASL	Sam Whited	2014-11-15	1	-2/+2
\| \| \| \|	Fixes #671
*	Cache SCRAM-SHA-1 keys for current session	Sam Whited	2014-11-15	1	-10/+47
\|
*	Add auth method pinning	Sam Whited	2014-11-15	4	-3/+30
\|
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	1	-22/+5
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-20/+1
\| \|
\| *	support for pgp files	iNPUTmice	2014-11-15	1	-2/+4
\| \|
* \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	1	-17/+55
\|\ \ \| \|/ \|/\|
\| *	initial smp support	iNPUTmice	2014-11-11	1	-17/+55
\| \|
* \|	Improve auth error handling and state machine	Sam Whited	2014-11-15	4	-32/+36
\| \|
* \|	Add SCRAM-SHA1 support	Sam Whited	2014-11-14	6	-80/+375
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* \|	Refactor authentication code	Sam Whited	2014-11-12	3	-0/+124
\|/
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	2	-8/+8
\| \| \| \|	Remove `Account.getFullJid()'
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	2	-33/+17
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-18/+27
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	2	-0/+616