conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'beriain-development' into development	Daniel Gultsch	2014-05-13	1	-71/+116
\|\
\| *	Merge branch 'development' of https://github.com/beriain/Conversations into b...	Daniel Gultsch	2014-05-13	1	-71/+116
\|/\|
\| *	Fix	Beriain	2014-05-13	1	-79/+79
\| *	Merge https://github.com/siacs/Conversations into development	Beriain	2014-05-13	14	-44/+416
\| \|\
\| * \|	Update basque translation and include preferences	Beriain	2014-05-13	1	-0/+8
\| * \|	Update basque translation	Beriain	2014-05-12	1	-0/+34
\| * \|	Merge https://github.com/siacs/Conversations into development	Beriain	2014-05-12	21	-265/+439
\| \|\ \
\| * \| \|	Update basque translation	Beriain	2014-05-08	1	-0/+3
* \| \| \|	code cleanup	Daniel Gultsch	2014-05-13	1	-10/+12
* \| \| \|	static method for providing content uri	Daniel Gultsch	2014-05-13	2	-8/+10
\| \|_\|/ \|/\| \|
* \| \|	ensure that iq response is being send out for jingle packets. remove jingle c...	Daniel Gultsch	2014-05-13	2	-22/+44
* \| \|	german translation	Daniel Gultsch	2014-05-13	1	-1/+1
* \| \|	further translations	Daniel Gultsch	2014-05-13	5	-17/+67
* \| \|	fixed npe in tag writer	Daniel Gultsch	2014-05-13	1	-2/+6
* \| \|	fixed french language	Daniel Gultsch	2014-05-13	1	-13/+13
* \| \|	Merge pull request #88 from BenoitBouvarel/development	Daniel Gultsch	2014-05-12	3	-0/+127
\|\ \ \
\| * \| \|	Traduction Francaise	Benoit Bouvarel	2014-05-07	3	-0/+127
* \| \| \|	Merge pull request #101 from kruks23/development	Daniel Gultsch	2014-05-12	1	-0/+28
\|\ \ \ \
\| * \| \| \|	Preferences Spanish Translations	kruks23	2014-05-12	1	-0/+28
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Fix a typo in catalan translation	alvar	2014-05-12	1	-1/+1
* \| \| \|	Translation into catalan language	alvar	2014-05-12	2	-0/+141
* \| \| \|	fixed parsing error on missing %s	Daniel Gultsch	2014-05-12	1	-2/+2
\|/ / /
* \| \|	marked version 0.2 - skipping beta0.2	Daniel Gultsch	2014-05-12	1	-2/+2
* \| \|	added changelog entry	Daniel Gultsch	2014-05-12	1	-0/+1
* \| \|	Better error handling if attach file doesnt work (on permission denied)0.2-beta	Daniel Gultsch	2014-05-12	10	-102/+112
* \| \|	transfered preferences descritpions into strings.xml	iNPUTmice	2014-05-11	2	-22/+45
* \| \|	Merge pull request #93 from kruks23/development	Daniel Gultsch	2014-05-10	1	-33/+42
\|\ \ \
\| * \| \|	Delete styles.xml	kruks23	2014-05-10	1	-19/+0
\| * \| \|	Merge remote-tracking branch 'origin/development' into development	kruks23	2014-05-10	1	-0/+19
\| \|\ \ \
\| \| * \| \|	#79 First translation into spanish.	kruks23	2014-05-06	3	-0/+127
\| * \| \| \|	Translation into spanish.	kruks23	2014-05-10	2	-52/+42
\| * \| \| \|	#79 First translation into spanish.	kruks23	2014-05-10	1	-0/+19
* \| \| \| \|	fixed possible npe and possible exception	iNPUTmice	2014-05-10	1	-2/+9
\|/ / / /
* \| \| \|	added dialog for otr file transfer0.2-alpha	Daniel Gultsch	2014-05-09	3	-3/+30
* \| \| \|	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2014-05-09	1	-1/+1
\|\ \ \ \
\| * \ \ \	Merge pull request #91 from the-solipsist/patch-1	Daniel Gultsch	2014-05-09	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Corrected spelling of "formerly" in README.me	the-solipsist	2014-05-09	1	-1/+1
* \| \| \| \| \|	version 0.2 alpha and changelog	Daniel Gultsch	2014-05-09	2	-2/+8
\|/ / / / /
* \| \| \| \|	link to openkeychain from contact details	Daniel Gultsch	2014-05-09	2	-9/+33
* \| \| \| \|	nicer descriptions in notificaton for images and encrypted messages	Daniel Gultsch	2014-05-09	5	-7/+37
\|/ / / /
* \| \| \|	Merge pull request #89 from dschuermann/fix-otr-message	Daniel Gultsch	2014-05-08	3	-2/+13
\|\ \ \ \
\| * \| \| \|	Improve OTR fingerprint dialog and fix german sentence	Dominik Schürmann	2014-05-08	3	-2/+13
\| * \| \| \|	Merge pull request #2 from siacs/development	Dominik Schürmann	2014-05-08	5	-111/+137
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	sending text message after returing from pending intent	Daniel Gultsch	2014-05-08	3	-80/+90
* \| \| \| \|	better flow after returning from openkeychain for various actions	Daniel Gultsch	2014-05-08	3	-31/+47
\| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Merge pull request #1 from siacs/development	Dominik Schürmann	2014-05-08	8	-231/+282
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	offer to announce pgp key if pgp encryption is selected from menu	Daniel Gultsch	2014-05-08	3	-42/+50
* \| \| \|	more informative dialog if contact doesn't announce public key	Daniel Gultsch	2014-05-08	3	-36/+57
* \| \| \|	code cleanup	Daniel Gultsch	2014-05-08	6	-164/+171
* \| \| \|	fixed download button on pgp images	Daniel Gultsch	2014-05-08	1	-4/+19