conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update more files to use JID objects	Sam Whited	2014-11-09	9	-32/+77
\|
*	Update another chunk of stuff to use JID objects	Sam Whited	2014-11-09	6	-74/+96
\|
*	update conversation fragment on every backend connect	iNPUTmice	2014-11-08	1	-2/+3
\|
*	Merge pull request #549 from emdete/p2	Daniel Gultsch	2014-11-08	1	-3/+7
\|\ \| \| \| \|	adjust api level wrapping
\| *	adjust api level wrapping	M. Dietrich	2014-11-04	1	-3/+7
\| \|
* \|	bug fixes for the previous ui refactoring	iNPUTmice	2014-11-07	3	-27/+20
\| \|
* \|	UI code refactoring	iNPUTmice	2014-11-07	3	-253/+172
\| \|
* \|	fixed #633	iNPUTmice	2014-11-06	1	-24/+26
\| \|
* \|	don't show avatar on initial account creation	iNPUTmice	2014-11-06	1	-2/+4
\| \|
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-11-04	2	-0/+56
\|\ \ \| \| \| \| \| \| \| \| \|	development
\| * \|	Convert about dialog to activity	Sam Whited	2014-11-04	2	-6/+29
\| \| \|
\| * \|	Move AboutDialog to correct path	Sam Whited	2014-11-04	1	-0/+33
\| \|/
* /	link to account details when touching own avatar	iNPUTmice	2014-11-04	1	-118/+124
\|/
*	Merge pull request #625 from SamWhited/linterfix	Daniel Gultsch	2014-11-04	1	-1/+3
\|\ \| \| \| \|	Make linter ignore properly checked API mismatch
\| *	Make linter ignore properly checked API mismatch	Sam Whited	2014-11-04	1	-1/+3
\| \|
* \|	show avatar in editaccount	iNPUTmice	2014-11-04	1	-1/+18
\|/
*	register nfc callback in every activity that provides a proper sharable uri	iNPUTmice	2014-11-04	5	-16/+18
\|
*	optimize code abit	M. Dietrich	2014-11-04	1	-29/+23
\|
*	implement "correct" ndef parsing	M. Dietrich	2014-11-04	1	-13/+25
\|
*	made qr code available from muc and contact details as well	iNPUTmice	2014-11-04	5	-105/+167
\|
*	added missing return statement. fixed api bug	iNPUTmice	2014-11-04	1	-3/+2
\|
*	be more OO	M. Dietrich	2014-11-04	1	-51/+44
\|
*	support pre JELLY_BEAN ndef	M. Dietrich	2014-11-04	1	-16/+24
\|
*	fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to ↵	iNPUTmice	2014-11-03	3	-165/+271
\|\ \| \| \| \| \| \|	@emdete
\| *	basic beam code / untested	iNPUTmice	2014-11-03	3	-127/+187
\| \|
* \|	unfinishd qr code implemenation. thanks to @emdete	iNPUTmice	2014-11-03	2	-11/+110
\|/
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	13	-103/+199
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	20	-0/+6024