conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	basic arbitrary file transfer	iNPUTmice	2014-11-15	11	-133/+326
\| \| \|
* \| \|	Merge branch 'feature/foreground_service' into development	iNPUTmice	2014-11-15	3	-9/+41
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-9/+39
\| \|/ /
* \| \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	6	-122/+445
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	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	3	-113/+144
\| \| \| \|
\| \| * \|	initial smp support	iNPUTmice	2014-11-10	6	-62/+356
\| \| \| \|
\| * \| \|	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	3	-113/+144
\| \| \| \|
\| * \| \|	initial smp support	iNPUTmice	2014-11-11	6	-62/+356
\| \| \| \|
* \| \| \|	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
* \| \| \|	Added check for empty from on group chat packet	Kevin Rauwolf	2014-11-14	1	-0/+3
\| \| \| \|
* \| \| \|	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
* \|	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
\| \|/ \|/\|
* \|	refactored code to always contain full jid for counterpart	iNPUTmice	2014-11-09	8	-86/+84
\| \|
* \|	fixed full jid for account	iNPUTmice	2014-11-09	1	-80/+76
\| \|
* \|	return null if from ist not set in abstract stanza	iNPUTmice	2014-11-09	1	-12/+17
\| \|
* \|	Check for illegal arguments to the toASCII func	Sam Whited	2014-11-09	2	-3/+17
\| \|
* \|	Fix contact highlighting in MUC	Sam Whited	2014-11-09	1	-2/+2
\| \|
* \|	Fix issue with IDN SRV records	Sam Whited	2014-11-09	1	-2/+3
\| \|
* \|	Fix crash on account creation	Sam Whited	2014-11-09	1	-13/+2
\| \|
* \|	Don't crash on packets with no "from" specified	Sam Whited	2014-11-09	1	-1/+2
\| \|
* \|	Create avatar's for JID's w/o localparts	Sam Whited	2014-11-09	4	-29/+13
\| \|
* \|	Fields that we sync on should be final	Sam Whited	2014-11-09	1	-1/+1
\| \|
* \|	Fix bug introduced by rebase	Sam Whited	2014-11-09	1	-5/+4
\| \|
* \|	Fix letter avatar selection in MUC	Sam Whited	2014-11-09	2	-13/+2
\| \|