conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	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.
\| *	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 translation
\| *	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
\| * \|	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
\|\ \| \| \| \|	Fix string 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 ↵	iNPUTmice	2014-11-17	1	-1/+1
\|\ \| \| \| \| \| \|	development
\| *	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
\|\ \| \| \| \| \| \| \| \|	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	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
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| * \|	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
\|\ \ \| \|/ \|/\|
\| *	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	2	-0/+14
\| \|
\| *	initial smp support	iNPUTmice	2014-11-11	3	-60/+192
\| \|
* \|	Merge pull request #666 from SamWhited/localefixes	Daniel Gultsch	2014-11-15	2	-3/+3
\|\ \ \| \| \| \| \| \|	Spelling fixes
\| * \|	Spelling fixes in Italian translation	Sam Whited	2014-11-14	1	-2/+2
\| \| \|
\| * \|	Spelling fix in German translation	Sam Whited	2014-11-14	1	-1/+1
\| \| \|
* \| \|	Make licenses info untranslatable	Sam Whited	2014-11-14	1	-1/+1
\|/ /
* \|	Update German language	kriztan	2014-11-12	1	-24/+0
\| \| \| \| \| \|	deleted 'pref_about_message'
* \|	Update German language	kriztan	2014-11-12	1	-5/+34
\|/