conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	verify contacts key only on initiating side of smp	iNPUTmice	2014-11-21	1	-0/+2
\|
*	brought ad hoc conferences back. fixed #688 fixed #367	iNPUTmice	2014-11-20	1	-0/+4
\|
*	context menu for conversations. fixed #630	iNPUTmice	2014-11-18	1	-0/+1
\|
*	Fix string	ferdev1	2014-11-16	1	-1/+1
\|
*	happy hanukkah	iNPUTmice	2014-11-16	1	-0/+2
\|
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	1	-0/+3
\|
*	Add incompatible server status	Sam Whited	2014-11-15	1	-0/+1
\|
*	Add security error status	Sam Whited	2014-11-15	1	-0/+1
\|
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	1	-1/+13
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	handled more error cases	iNPUTmice	2014-11-15	1	-0/+1
\| \|
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-0/+2
\| \|
\| *	made file transfers cancelable	iNPUTmice	2014-11-15	1	-1/+2
\| \|
\| *	adepted conversationadapter to deal with files	iNPUTmice	2014-11-15	1	-0/+2
\| \|
\| *	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-0/+1
\| \|
\| *	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	1	-1/+2
\| \|
\| *	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-1/+5
\| \|
* \|	Merge branch 'feature/foreground_service' into development	iNPUTmice	2014-11-15	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| * \|	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-0/+4
\| \|/
* \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	1	-0/+17
\|\ \ \| \|/ \|/\|
\| *	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	1	-0/+2
\| \|
\| *	initial smp support	iNPUTmice	2014-11-11	1	-0/+15
\| \|
* \|	Make licenses info untranslatable	Sam Whited	2014-11-14	1	-1/+1
\|/
*	formating	iNPUTmice	2014-11-09	1	-9/+9
\|
*	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.
*	reformated license a bit	iNPUTmice	2014-11-04	1	-19/+13
\|
*	Shorten license text and fix height of scrollview	Sam Whited	2014-11-04	1	-18/+5
\|
*	Make links clickable in about text	Sam Whited	2014-11-04	1	-3/+4
\|
*	Convert about dialog to activity	Sam Whited	2014-11-04	1	-12/+10
\|
*	Use real copyright symbol ©	Sam Whited	2014-11-04	1	-3/+3
\|
*	Add about dialog with license info	Sam Whited	2014-11-04	1	-0/+37
\|
*	show avatar in editaccount	iNPUTmice	2014-11-04	1	-0/+1
\|
*	unfinishd qr code implemenation. thanks to @emdete	iNPUTmice	2014-11-03	1	-1/+2
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-5/+15
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+276