PiratX - The new way for communications

	Commit message (Collapse)	Author	Age	Files	Lines
*	better usage of synchronized in some places	iNPUTmice	2014-11-18	1	-76/+78
\|
*	context menu for muc participants + refactor trueCounterpart to use Jid class	iNPUTmice	2014-11-17	1	-1/+1
\|
*	synchronized around cache clear in avatar service	iNPUTmice	2014-11-17	1	-9/+15
\|
*	Merge pull request #673 from SamWhited/development	Daniel Gultsch	2014-11-16	1	-1/+1
\|\ \| \| \| \|	Fix fetching accounts by JIDs
\| *	Fix fetching accounts by JIDs	Sam Whited	2014-11-16	1	-1/+1
\| \| \| \| \| \| \| \|	Fixes a crash when publishing an avatar
* \|	happy hanukkah	iNPUTmice	2014-11-16	1	-10/+4
\|/
*	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵	iNPUTmice	2014-11-16	1	-8/+7
\| \| \| \|	shareable uri where ever possible
*	Make account status an enum	Sam Whited	2014-11-15	2	-98/+98
\|
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	2	-37/+74
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	2	-44/+24
\| \|
\| *	fixed resending for files as well	iNPUTmice	2014-11-15	1	-3/+3
\| \|
\| *	made file transfers cancelable	iNPUTmice	2014-11-15	1	-0/+5
\| \|
\| *	support for pgp files	iNPUTmice	2014-11-15	1	-3/+11
\| \|
\| *	copy non local files to private storage first	iNPUTmice	2014-11-15	1	-17/+28
\| \|
\| *	bug fixes and various improvements for file transfer	iNPUTmice	2014-11-15	1	-1/+1
\| \|
\| *	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-3/+36
\| \|
* \|	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	2	-9/+37
\|/
*	temporarliy got rid of some insane work arounds in favor of some maybe less ↵	iNPUTmice	2014-11-11	1	-8/+8
\| \| \| \|	insane work arounds
*	more refactoring for presence selection. removed getTo, getFrom and getJid ↵	iNPUTmice	2014-11-10	1	-208/+231
\| \| \| \|	from Element
*	migrated some otr stuff to new jid classes	iNPUTmice	2014-11-09	1	-7/+9
\|
*	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-11-09	2	-19/+19
\|\ \| \| \| \| \| \|	development
\| *	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	2	-19/+19
\| \| \| \| \| \| \| \|	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
\| \|
* \|	refactored code to always contain full jid for counterpart	iNPUTmice	2014-11-09	1	-25/+41
\| \|
* \|	Create avatar's for JID's w/o localparts	Sam Whited	2014-11-09	1	-3/+3
\| \|
* \|	Fields that we sync on should be final	Sam Whited	2014-11-09	1	-1/+1
\| \|
* \|	It builds again!	Sam Whited	2014-11-09	1	-5/+2
\| \|
* \|	Update more files to use JID objects	Sam Whited	2014-11-09	2	-7/+7
\| \|
* \|	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-84/+89
\|/
*	fixed notifications for images	iNPUTmice	2014-11-05	1	-13/+34
\|
*	fixed #617	iNPUTmice	2014-11-05	1	-26/+22
\|
*	fixed arrayoutofbounds + spelling	iNPUTmice	2014-11-01	1	-1/+1
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	3	-80/+192
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	5	-0/+2509