conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	refactored options menu handling a bit	iNPUTmice	2014-09-23	1	-140/+149
\|
*	changed app title in cs translation	iNPUTmice	2014-09-23	1	-1/+1
\|
*	dont mark message as send on resend	iNPUTmice	2014-09-23	1	-1/+6
\|
*	fixed rare npe	iNPUTmice	2014-09-23	1	-20/+21
\|
*	fixed very rare npe	iNPUTmice	2014-09-22	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
\| \| *	Added Chinese (Simplified) Translation	AZ	2014-09-22	1	-0/+260
\| \| \|
* \| \|	fixed #452	iNPUTmice	2014-09-22	6	-4/+30
\|/ /
* \|	don't show time stamp within the last 6 hours of a new day	iNPUTmice	2014-09-22	1	-1/+1
\| \|
* \|	added 'model' to selectable resources. fixed #461	iNPUTmice	2014-09-22	1	-1/+15
\| \|
* \|	show full date in message list, fixed #328	iNPUTmice	2014-09-21	2	-4/+20
\| \|
* \|	changed message merger a bit	iNPUTmice	2014-09-21	1	-9/+10
\| \|
* \|	changed some preference descriptions	iNPUTmice	2014-09-21	2	-5/+5
\| \|
* \|	fixed #454 - added fast srcolling to some lists	iNPUTmice	2014-09-21	2	-0/+2
\| \|
* \|	changed security indicator and changed opacity of received tick to match the ↵	iNPUTmice	2014-09-20	7	-14/+18
\| \| \| \| \| \| \| \|	text
* \|	Merge pull request #460 from betheg/receipts	Daniel Gultsch	2014-09-20	16	-10/+143
\|\ \ \| \| \| \| \| \|	indicates received messages with a tick.
\| * \|	indicates received messages with a tick.	Michael	2014-09-20	16	-10/+143
\| \| \|
* \| \|	fixed presence splitting	iNPUTmice	2014-09-20	13	-31/+31
\| \| \|
* \| \|	fixed #470	iNPUTmice	2014-09-20	4	-43/+60
\|/ /
* \|	made xmppconnection service available in generators	iNPUTmice	2014-09-20	5	-4/+27
\| \|
* \|	scroll fixes	iNPUTmice	2014-09-19	2	-10/+11
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-19	2	-18/+18
\|\ \
\| * \	Merge pull request #469 from svetlemodry/development	Daniel Gultsch	2014-09-19	2	-18/+18
\| \|\ \ \| \| \| \| \| \| \| \|	Czech Conversations strings update
\| \| * \|	Czech strings.xml file update	Jaroslav Lichtblau	2014-09-19	1	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \|	typo fixes, app name unified and some more changes for better string understanding
\| \| * \|	improvement fix	Jaroslav Lichtblau	2014-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	better to have all in Czech, even the app name
* \| \| \|	background daemon doesn't start automatically if there are no enabled ↵	iNPUTmice	2014-09-19	2	-2/+13
\|/ / / \| \| \| \| \| \| \| \| \|	accounts. fixed #443 fixed #442
* \| \|	fixed #462	iNPUTmice	2014-09-19	1	-5/+5
\| \| \|
* \| \|	fixed compile errors in italian translation	iNPUTmice	2014-09-19	2	-14/+14
\|/ /
* \|	Merge pull request #448 from betheg/add_break	Daniel Gultsch	2014-09-19	4	-7/+1
\|\ \ \| \| \| \| \| \|	add a forgotten break and remove some unused imports
\| * \|	add a forgotten break and remove some unused imports	Michael	2014-09-13	4	-7/+1
\| \| \|
* \| \|	Merge pull request #447 from betheg/private_notify	Daniel Gultsch	2014-09-19	1	-4/+6
\|\ \ \ \| \| \| \| \| \| \| \|	MUC: notify also on private messages
\| * \| \|	MUC: notify also on private messages	Michael	2014-09-13	1	-4/+6
\| \|/ /
* \| \|	Merge pull request #453 from Elinvention/development	Daniel Gultsch	2014-09-19	2	-0/+299
\|\ \ \ \| \| \| \| \| \| \| \|	Created Italian translation
\| * \| \|	Created Italian translation	Elia Argentieri	2014-09-14	2	-0/+299
\| \|/ /
* \| \|	Merge pull request #467 from qooob/development	Daniel Gultsch	2014-09-19	3	-44/+70
\|\ \ \ \| \| \| \| \| \| \| \|	Localization update to 0.7.1
\| * \| \|	Updated localization	Ilia Rostovtsev	2014-09-19	1	-40/+66
\| \| \| \| \| \| \| \| \| \| \| \|	Localization update in compliance with Conversations 0.7.1
\| * \| \|	Typoes	Ilia Rostovtsev	2014-09-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Fixing typos
\| * \| \|	Updated username	Ilia Rostovtsev	2014-09-19	1	-1/+1
\| \|/ / \| \| \| \| \| \|	Changing URL of my account, in accordance with updated username
* \| \|	Merge pull request #465 from beriain/development	Daniel Gultsch	2014-09-19	2	-4/+43
\|\ \ \ \| \| \| \| \| \| \| \|	Update basque translation
\| * \| \|	Update strings.xml	Aitor Beriain	2014-09-18	1	-3/+28
\| \| \| \|
\| * \| \|	Update arrays.xml	Aitor Beriain	2014-09-18	1	-1/+15
\| \|/ /
* \| \|	Merge pull request #466 from weiss/add-german-translations	Daniel Gultsch	2014-09-19	1	-0/+24
\|\ \ \ \| \|/ / \|/\| \|	Add missing German translations
\| * \|	Add missing German translations	Holger Weiß	2014-09-19	1	-0/+24
\| \|/
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-12	1	-5/+8
\|\ \
\| * \	Merge pull request #445 from betheg/namespace	Daniel Gultsch	2014-09-12	1	-5/+8
\| \|\ \ \| \| \|/ \| \|/\|	add proper namespace in carbon
\| \| *	add proper namespace in carbon	Michael	2014-09-12	1	-5/+8
\| \|/
* /	fixed #446	iNPUTmice	2014-09-12	1	-0/+1
\|/
*	Merge branch 'development'0.7.1	iNPUTmice	2014-09-12	93	-625/+948
\|\