conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	23	-275/+772
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	handled more error cases	iNPUTmice	2014-11-15	3	-5/+30
\| \|
\| *	better cleanup after unsuccesful transfers	iNPUTmice	2014-11-15	3	-1/+35
\| \|
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	8	-50/+93
\| \|
\| *	fixed resending for files as well	iNPUTmice	2014-11-15	2	-3/+4
\| \|
\| *	made file transfers cancelable	iNPUTmice	2014-11-15	8	-22/+76
\| \|
\| *	adepted conversationadapter to deal with files	iNPUTmice	2014-11-15	2	-3/+23
\| \|
\| *	progress for ibb transfers	iNPUTmice	2014-11-15	5	-13/+27
\| \|
\| *	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	7	-73/+71
\| \|
\| *	support for pgp files	iNPUTmice	2014-11-15	5	-23/+38
\| \|
\| *	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	7	-8/+40
\| \|
\| *	copy non local files to private storage first	iNPUTmice	2014-11-15	3	-23/+77
\| \|
\| *	bug fixes and various improvements for file transfer	iNPUTmice	2014-11-15	5	-19/+30
\| \|
\| *	basic arbitrary file transfer	iNPUTmice	2014-11-15	13	-136/+332
\| \|
* \|	Merge branch 'feature/foreground_service' into development	iNPUTmice	2014-11-15	9	-9/+50
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| * \|	added low priority and removed date in foreground noticfication	iNPUTmice	2014-11-15	1	-0/+2
\| \| \|
\| * \|	turn on foreground service in expert settings	iNPUTmice	2014-11-15	9	-9/+48
\| \|/
* \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	10	-182/+655
\|\ \ \| \|/ \|/\|
\| *	check if account is online before doing smpfeature/otr_verification	iNPUTmice	2014-11-12	1	-11/+24
\| \|
\| *	Merge branch 'feature/otr_verification' of ↵	iNPUTmice	2014-11-11	1	-1/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
\| \| *	small bug fix	iNPUTmice	2014-11-10	1	-8/+3
\| \| \|
\| \| *	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-10	5	-113/+158
\| \| \|
\| \| *	initial smp support	iNPUTmice	2014-11-10	10	-122/+552
\| \| \|
\| * \|	use auto register for verify otr listeners	iNPUTmice	2014-11-11	1	-9/+0
\| \| \|
\| * \|	small bug fix	iNPUTmice	2014-11-11	1	-8/+3
\| \| \|
\| * \|	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	5	-113/+158
\| \| \|
\| * \|	initial smp support	iNPUTmice	2014-11-11	10	-122/+552
\| \| \|
* \| \|	Merge pull request #665 from SamWhited/issue71	Daniel Gultsch	2014-11-15	8	-381/+729
\|\ \ \ \| \| \| \| \| \| \| \|	Add SCRAM-SHA1 support
\| * \| \|	Improve auth error handling and state machine	Sam Whited	2014-11-15	5	-40/+43
\| \| \| \|
\| * \| \|	Add SCRAM-SHA1 support	Sam Whited	2014-11-14	9	-381/+726
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* \| \| \|	Merge pull request #666 from SamWhited/localefixes	Daniel Gultsch	2014-11-15	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Spelling fixes
\| * \| \| \|	Spelling fixes in Italian translation	Sam Whited	2014-11-14	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Spelling fix in German translation	Sam Whited	2014-11-14	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #667 from SamWhited/licensesuntranslatable	Daniel Gultsch	2014-11-15	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Make licenses info untranslatable
\| * \| \|	Make licenses info untranslatable	Sam Whited	2014-11-14	1	-1/+1
\|/ / /
* \| \|	Merge pull request #664 from squidpickles/development	Daniel Gultsch	2014-11-14	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Added check for empty from on group chat packet
\| * \| \|	Added check for empty from on group chat packet	Kevin Rauwolf	2014-11-14	1	-0/+3
\|/ / /
* \| \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-11-14	1	-5/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \ \	Merge pull request #653 from kriztan/patch-2	Daniel Gultsch	2014-11-14	1	-5/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Update German language
\| \| * \| \|	Update German language	kriztan	2014-11-12	1	-24/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deleted 'pref_about_message'
\| \| * \| \|	Update German language	kriztan	2014-11-12	1	-5/+34
\| \| \|/ /
* \| / /	fixed possible npe when loading null counterpart into message	iNPUTmice	2014-11-14	1	-1/+6
\|/ / /
* \| \|	made presences synchronized	iNPUTmice	2014-11-13	1	-13/+27
\| \| \|
* \| \|	more npe checks in muc packet parser	iNPUTmice	2014-11-13	1	-31/+34
\| \| \|
* \| \|	Merge pull request #656 from SamWhited/authrefactor	Daniel Gultsch	2014-11-12	5	-88/+145
\|\ \ \ \| \| \| \| \| \| \| \|	Refactor authentication code
\| * \| \|	Refactor authentication code	Sam Whited	2014-11-12	5	-88/+145
\| \|/ /
* \| \|	Merge pull request #659 from SamWhited/jidfixes	Daniel Gultsch	2014-11-12	1	-2/+3
\|\ \ \ \| \|/ / \|/\| \|	Make sure we're storing the display JID as Unicode
\| * \|	Make sure we're storing the display JID as Unicode	Sam Whited	2014-11-12	1	-2/+3
\|/ /
* \|	auto register/unregister listeners	iNPUTmice	2014-11-11	7	-345/+289
\| \|
* \|	temporarliy got rid of some insane work arounds in favor of some maybe less ↵	iNPUTmice	2014-11-11	3	-14/+17
\|/ \| \| \|	insane work arounds