conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \|	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
\| \|/ / /
* / / /	Make licenses info untranslatable	Sam Whited	2014-11-14	1	-1/+1
\|/ / /
* \| \|	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
\| \|/ /
* / /	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
*	made Jid class parse otr session ids	iNPUTmice	2014-11-10	1	-0/+10
\|
*	more refactoring for presence selection. removed getTo, getFrom and getJid ↵	iNPUTmice	2014-11-10	8	-274/+283
\| \| \| \|	from Element
*	formating	iNPUTmice	2014-11-09	2	-24/+9
\|
*	Merge pull request #645 from betheg/about_all_libs	Daniel Gultsch	2014-11-09	1	-15/+24
\|\ \| \| \| \|	add all used libs to the pref_about_message
\| *	add libidn to pref_about_message.	Michael	2014-11-09	1	-0/+1
\| \|
\| *	add all used libs to the pref_about_message.	Michael	2014-11-09	1	-15/+23
\| \| \| \| \| \| \| \|	also improve the notice a bit.
* \|	fixed private messages	iNPUTmice	2014-11-09	1	-2/+2
\| \|
* \|	s/getResourcepart().isEmpty()/isBareJid()/	Sam Whited	2014-11-09	5	-7/+7
\| \|
* \|	use isBareJid instead of getResourcePart().isEmpty()	iNPUTmice	2014-11-09	2	-2/+2
\| \|
* \|	fixed muc sender history for some cases (where the previous nick was a valid ↵	iNPUTmice	2014-11-09	2	-8/+17
\| \| \| \| \| \| \| \|	jid)
* \|	migrated some otr stuff to new jid classes	iNPUTmice	2014-11-09	2	-79/+82
\| \|
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-11-09	27	-106/+102
\|\ \ \| \| \| \| \| \| \| \| \|	development
\| * \	Merge pull request #642 from SamWhited/accountgetjid	Daniel Gultsch	2014-11-09	27	-106/+102
\| \|\ \ \| \| \| \| \| \| \| \|	Rework `Account.getJid()' to return full JIDs
\| \| * \|	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	27	-106/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `Account.getFullJid()'
* \| \| \|	Merge branch 'master' into development	iNPUTmice	2014-11-09	1	-14/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	make avatar service not break on empty names	iNPUTmice	2014-11-09	1	-14/+22
\| \| \| \|
* \| \| \|	fixed null pointer in message merger	iNPUTmice	2014-11-09	1	-0/+1
\| \|/ / \|/\| \|