PiratX - The new way for communications

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	6	-58/+214
\|
*	Merge branch 'master' into development	iNPUTmice	2014-11-16	1	-5/+18
\|\
\| *	close cursor for database	iNPUTmice	2014-11-16	1	-5/+18
\| \|
\| *	made presences synchronized	iNPUTmice	2014-11-13	1	-13/+27
\| \|
\| *	more npe checks in muc packet parser	iNPUTmice	2014-11-13	1	-32/+35
\| \|
* \|	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵	iNPUTmice	2014-11-16	11	-69/+119
\| \| \| \| \| \| \| \|	shareable uri where ever possible
* \|	Merge pull request #669 from SamWhited/scramcaching	Daniel Gultsch	2014-11-15	2	-10/+51
\|\ \ \| \| \| \| \| \|	Cache SCRAM-SHA-1 keys for current session
\| * \|	Cache SCRAM-SHA-1 keys for current session	Sam Whited	2014-11-15	2	-10/+51
\| \| \|
* \| \|	Merge pull request #670 from kruks23/translation9	Daniel Gultsch	2014-11-15	1	-3/+38
\|\ \ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
\| * \| \|	Update Spanish Translations	kruks23	2014-11-15	1	-3/+38
\| \|/ /
* / /	small modifications for changing an account status in XmppConnection	iNPUTmice	2014-11-15	1	-8/+6
\|/ /
* \|	Merge pull request #668 from SamWhited/auth-pinning	Daniel Gultsch	2014-11-15	18	-280/+295
\|\ \ \| \| \| \| \| \|	Auth mechanism pinning
\| * \|	Set security error status on TLS cert mismatch	Sam Whited	2014-11-15	1	-6/+7
\| \| \|
\| * \|	Remove extra status wrapper method	Sam Whited	2014-11-15	2	-6/+1
\| \| \|
\| * \|	Add incompatible server status	Sam Whited	2014-11-15	4	-66/+19
\| \| \|
\| * \|	Add security error status	Sam Whited	2014-11-15	4	-13/+22
\| \| \|
\| * \|	Make account status an enum	Sam Whited	2014-11-15	13	-200/+215
\| \| \|
\| * \|	Add auth method pinning	Sam Whited	2014-11-15	6	-16/+58
\| \| \|
* \| \|	fixed some disco / carbon related bugs	iNPUTmice	2014-11-15	1	-29/+43
\|/ /
* \|	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 smp	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