conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Update spanish translations	kruks23	2014-12-01	1	-9/+11
*	fixed italian translation	iNPUTmice	2014-12-01	1	-5/+5
*	Removed pref_about_message which is not translatable	Elinvention	2014-11-30	1	-24/+0
*	Added missing italian translations with some minor fixes to existing ones	Elinvention	2014-11-30	2	-10/+113
*	Merge pull request #721 from SamWhited/warning_fixes	Daniel Gultsch	2014-11-29	3	-3/+8
\|\
\| *	Accessibility: Add missing image descriptions	Sam Whited	2014-11-29	3	-3/+8
* \|	Update basque translation	Aitor Beriain	2014-11-27	1	-0/+6
\|/
*	Update german translations	kriztan	2014-11-26	1	-1/+1
*	Merge pull request #714 from betheg/muc_bookmark_cd	Daniel Gultsch	2014-11-24	1	-0/+10
\|\
\| *	MUC: option to set/delete bookmark in conference details.	Michael	2014-11-23	1	-0/+10
* \|	Update german translations	kriztan	2014-11-23	1	-0/+2
\|/
*	Update spanish translations	kruks23	2014-11-22	1	-2/+8
*	verify contacts key only on initiating side of smp	iNPUTmice	2014-11-21	1	-0/+2
*	Update german translations	kriztan	2014-11-20	1	-16/+20
*	brought ad hoc conferences back. fixed #688 fixed #367	iNPUTmice	2014-11-20	1	-0/+4
*	Merge pull request #691 from kruks23/development	Daniel Gultsch	2014-11-19	1	-5/+11
\|\
\| *	Update spanish translations	kruks23	2014-11-19	1	-4/+4
\| *	Update spanish translations	kruks23	2014-11-18	1	-2/+8
* \|	Merge pull request #692 from kriztan/patch-3	Daniel Gultsch	2014-11-19	1	-0/+41
\|\ \
\| * \|	Update german translations	kriztan	2014-11-19	1	-0/+41
\| \|/
* /	Update basque translation	Aitor Beriain	2014-11-19	1	-0/+56
\|/
*	put error notification into notification service	iNPUTmice	2014-11-18	4	-0/+0
*	show dynamic tags in contacts activity as well	iNPUTmice	2014-11-18	1	-12/+7
*	properly remove conversations context menu	iNPUTmice	2014-11-18	2	-11/+7
*	added rendered versions of new icons	iNPUTmice	2014-11-18	8	-0/+0
*	context menu for conversations. fixed #630	iNPUTmice	2014-11-18	2	-0/+12
*	context menu for muc participants + refactor trueCounterpart to use Jid class	iNPUTmice	2014-11-17	1	-1/+4
*	synchronized around cache clear in avatar service	iNPUTmice	2014-11-17	1	-0/+4
*	Merge pull request #680 from ferdev1/patch-2	Daniel Gultsch	2014-11-17	1	-2/+2
\|\
\| *	Update strings.xml	ferdev1	2014-11-17	1	-2/+2
* \|	slightly modified logo / launcher icon	iNPUTmice	2014-11-17	8	-0/+0
\|/
*	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-11-17	1	-1/+1
\|\
\| *	Fix string	ferdev1	2014-11-16	1	-1/+1
* \|	highlight muc members by touching their name in muc details. fixed #503	iNPUTmice	2014-11-17	1	-1/+1
\|/
*	happy hanukkah	iNPUTmice	2014-11-16	5	-1/+30
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	3	-5/+28
*	Update Spanish Translations	kruks23	2014-11-15	1	-3/+38
*	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	3	-3/+17
\|\
\| *	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	2	-1/+5
\| *	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	2	-3/+6
* \|	Merge branch 'feature/foreground_service' into development	iNPUTmice	2014-11-15	6	-0/+9
\|\ \
\| * \|	turn on foreground service in expert settings	iNPUTmice	2014-11-15	6	-0/+9
\| \|/
* \|	Merge branch 'feature/otr_verification' into development	iNPUTmice	2014-11-15	3	-60/+206
\|\ \ \| \|/ \|/\|