conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	made httpconnection (download) ready all kind of filesfeature/http_upload	Daniel Gultsch	2015-06-30	1	-2/+2
\|
*	refactored bodyContainsDownloadable to be more flexible	Daniel Gultsch	2015-06-30	1	-1/+1
\|
*	untested pgp support for http upload	Daniel Gultsch	2015-06-29	1	-5/+9
\|
*	renamed OtrEngine to OtrService	Daniel Gultsch	2015-05-26	1	-3/+3
\|
*	OTR: Fix onContactStatusChanged & dont archive OTR	BrianBlade	2015-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \|	- Fix session handling on contact status change: Do not reset potentially active sessions; check peer's OTR-resource on disconnect - use no-permanent-store hint instead of no-store to ensure finished messages are delivered to offline/disconnected clients - add no-permanent-store to ask compliant servers not to archive OTR messages
*	Fix OTR-Error messages	BrianBlade	2015-04-01	1	-16/+22
\| \| \| \| \|	Send out OTR-Errors on unreadableMessageReceived() as well, not only on messageFromAnotherInstanceReceived
*	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	1	-3/+15
\|
*	added typing notifications through XEP-0085. fixed #210	iNPUTmice	2015-02-21	1	-0/+14
\|
*	otr4j: update to 0.22	Michael	2015-01-20	1	-0/+6
\|
*	do not check image file size over http if accepted file size is 0	Daniel Gultsch	2015-01-11	1	-3/+6
\|
*	some further otr improvements	Daniel Gultsch	2015-01-02	1	-1/+1
\|
*	prefer PLAIN over DIGEST-MD5	Daniel Gultsch	2015-01-02	1	-1/+1
\| \| \| \| \|	DIGEST-MD5 seems to be broken for a lot of cases (OpenFire) switched priority of PLAIN to not cause any security errors
*	improved OTR verification part one	Daniel Gultsch	2015-01-02	1	-3/+3
\|
*	mark otr messages as no-store for mam	iNPUTmice	2014-12-10	1	-0/+1
\|
*	fixed digest-md5	iNPUTmice	2014-12-04	1	-0/+4
\|
*	Make sure SASL tokenizer strips strings	Sam Whited	2014-12-02	2	-1/+5
\| \| \| \|	Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==')
*	remove unused imports.	Michael	2014-11-21	1	-2/+0
\|
*	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