conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #569 from kriztan/patch-1	Daniel Gultsch	2014-10-20	1	-0/+1
\|\
\| *	Set default preference ...	kriztan	2014-10-19	1	-1/+2
* \|	Fixed some strange wording in a string	Sam Whited	2014-10-19	1	-1/+1
* \|	Merge pull request #554 from SamWhited/tls	Daniel Gultsch	2014-10-20	2	-3/+10
\|\ \
\| * \|	Make legacy SSL option default to false	Sam Whited	2014-10-19	1	-1/+1
\| * \|	Add "Enable legacy SSL" preference	Sam Whited	2014-10-19	2	-3/+10
* \| \|	mtm support for image downloader	iNPUTmice	2014-10-19	1	-0/+1
* \| \|	fixed typo in french translation	iNPUTmice	2014-10-19	1	-1/+1
* \| \|	Update strings.xml	Benoit Bouvarel	2014-10-18	1	-2/+63
\| \|/ \|/\|
* \|	do not attempt to download images when not connected	iNPUTmice	2014-10-17	1	-0/+1
\|/
*	detect deleted files on start up. got rid of lagecy image provider for perfor...	iNPUTmice	2014-10-15	1	-0/+1
*	refactored file download status. make image http download available for carbo...	iNPUTmice	2014-10-15	1	-0/+8
*	Merge pull request #506 from SamWhited/string_fixes	Daniel Gultsch	2014-10-15	1	-2/+2
\|\
\| *	Remove full stop in description for consistency	Sam Whited	2014-09-29	1	-1/+1
\| *	Fix typos in string resource	Sam Whited	2014-09-29	1	-2/+2
* \|	read image bounds on downloaded image	iNPUTmice	2014-10-14	1	-0/+1
* \|	changed card boarder a bit	iNPUTmice	2014-10-13	1	-4/+17
* \|	reworked muc details and contact details a bit	iNPUTmice	2014-10-13	10	-207/+181
* \|	added missing border	iNPUTmice	2014-10-13	1	-0/+6
* \|	redesigned contact details a bit	iNPUTmice	2014-10-13	3	-91/+75
* \|	Update Spanish Translations	kruks23	2014-10-08	1	-0/+4
* \|	cleanung up the scroll fix a little	iNPUTmice	2014-10-06	1	-1/+1
* \|	work around for message scroll bug	iNPUTmice	2014-10-06	1	-1/+2
* \|	muc options clean up	iNPUTmice	2014-10-06	1	-3/+3
* \|	made conversations overview list always 1/3 on tablet devices	iNPUTmice	2014-10-05	1	-3/+6
* \|	MUC: differentiated a few more errors.	Michael	2014-10-05	2	-0/+6
* \|	minor ui tweak	iNPUTmice	2014-10-04	1	-3/+4
* \|	minor graphic tweaks in copy otr fingerprint to clipboard	iNPUTmice	2014-10-03	1	-1/+3
* \|	let's own otr-fingerprint copy to clipboard.	Michael	2014-10-03	7	-8/+32
* \|	fixed chinese translations	iNPUTmice	2014-10-03	5	-265/+263
* \|	bug fixes	iNPUTmice	2014-10-03	1	-2/+2
* \|	revised tablet ui. fixed #423	iNPUTmice	2014-10-03	5	-15/+14
* \|	1) Renamed values-zh values-zh_rCN in accordance with #329 and Android conven...	Isaac Kwan	2014-10-03	4	-0/+343
\|/
*	notifiy only when necessary	Daniel Gultsch	2014-09-29	1	-8/+8
*	more improvments for new notification service	Daniel Gultsch	2014-09-28	5	-29/+20
*	Merge pull request #485 from kruks23/translation5	Daniel Gultsch	2014-09-27	1	-0/+7
\|\
\| *	Update Spanish Translations	kruks23	2014-09-24	1	-0/+7
* \|	Merge pull request #487 from weiss/add-german-translations	Daniel Gultsch	2014-09-27	2	-0/+9
\|\ \
\| * \|	Add missing German translations	Holger Weiß	2014-09-24	2	-0/+9
\| \|/
* \|	Merge pull request #498 from betheg/locale_folder	Daniel Gultsch	2014-09-27	2	-0/+0
\|\ \
\| * \|	fix lint-warning: Wrong locale name	Michael	2014-09-26	2	-0/+0
\| \|/
* \|	Merge pull request #499 from betheg/hardcoded_string	Daniel Gultsch	2014-09-27	1	-1/+1
\|\ \
\| * \|	fix lint-warning: Hardcoded text	Michael	2014-09-26	1	-1/+1
\| \|/
* /	revised send button in landscape mode	iNPUTmice	2014-09-27	1	-1/+1
\|/
*	changed app title in cs translation	iNPUTmice	2014-09-23	1	-1/+1
*	formating fixes for chinese	iNPUTmice	2014-09-22	1	-2/+2
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-22	1	-0/+260
\|\
\| *	Merge pull request #479 from AizazAZ/master	Daniel Gultsch	2014-09-22	1	-0/+260
\| \|\
\| \| *	Added Chinese (Simplified) Translation	AZ	2014-09-22	1	-0/+260
* \| \|	fixed #452	iNPUTmice	2014-09-22	2	-1/+8
\|/ /