conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	4	-7/+80
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-0/+39
\| \|
\| *	made file transfers cancelable	iNPUTmice	2014-11-15	1	-0/+2
\| \|
\| *	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-6/+8
\| \|
\| *	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	1	-0/+1
\| \|
\| *	basic arbitrary file transfer	iNPUTmice	2014-11-15	3	-7/+36
\| \|
* \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	1	-2/+32
\|\ \ \| \|/ \|/\|
\| *	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	1	-0/+4
\| \|
\| *	initial smp support	iNPUTmice	2014-11-11	1	-2/+28
\| \|
* \|	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
\|/
*	more refactoring for presence selection. removed getTo, getFrom and getJid ↵	iNPUTmice	2014-11-10	1	-9/+5
\| \| \| \|	from Element
*	s/getResourcepart().isEmpty()/isBareJid()/	Sam Whited	2014-11-09	2	-3/+3
\|
*	migrated some otr stuff to new jid classes	iNPUTmice	2014-11-09	1	-72/+73
\|
*	Merge pull request #642 from SamWhited/accountgetjid	Daniel Gultsch	2014-11-09	1	-5/+1
\|\ \| \| \| \|	Rework `Account.getJid()' to return full JIDs
\| *	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-5/+1
\| \| \| \| \| \| \| \|	Remove `Account.getFullJid()'
* \|	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	2	-22/+5
\|
*	fixed full jid for account	iNPUTmice	2014-11-09	1	-80/+76
\|
*	Create avatar's for JID's w/o localparts	Sam Whited	2014-11-09	1	-6/+8
\|
*	Fix letter avatar selection in MUC	Sam Whited	2014-11-09	1	-0/+1
\|
*	It builds again!	Sam Whited	2014-11-09	1	-7/+7
\|
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-2/+2
\|
*	Update another chunk of stuff to use JID objects	Sam Whited	2014-11-09	1	-7/+2
\|
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-3/+3
\|
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	8	-195/+235
\|
*	fixed #634	iNPUTmice	2014-11-09	1	-2/+2
\|
*	Add last seen info to the database	Sam Whited	2014-11-04	1	-13/+36
\| \| \| \|	Fixes #612
*	fixed arrayoutofbounds + spelling	iNPUTmice	2014-11-01	1	-6/+6
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-25/+59
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	12	-0/+2612