conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	deleted unnecessary log	iNPUTmice	2014-08-31	1	-2/+0
\|
*	Merge pull request #401 from jelmer/dutch-updates	Daniel Gultsch	2014-08-31	1	-0/+33
\|\ \| \| \| \|	Update Dutch translations.
\| *	Update Dutch translations.	Jelmer Vernooij	2014-08-31	1	-0/+33
\| \|
* \|	show merged time and status in message adapter	iNPUTmice	2014-08-31	2	-3/+21
\| \|
* \|	improvements for merge conditions	iNPUTmice	2014-08-31	2	-3/+9
\| \|
* \|	add missing blank before nick	iNPUTmice	2014-08-31	1	-0/+3
\| \|
* \|	Merge pull request #400 from xsrc/development	Daniel Gultsch	2014-08-31	1	-6/+3
\|\ \ \| \| \| \| \| \|	Smarter nickname highlight insert in confernces
\| * \|	Smarter nickname highlight insert in confernces	Bahtiar `kalkin-` Gadimov	2014-08-31	1	-6/+3
\|/ /
* \|	some code cleanup	iNPUTmice	2014-08-31	75	-1263/+1482
\| \|
* \|	Merge pull request #391 from betheg/fix_typo	Daniel Gultsch	2014-08-31	1	-4/+4
\|\ \ \| \| \| \| \| \|	fix forgotten spelling.
\| * \	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-30	9	-167/+364
\| \|\ \
\| * \ \	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-29	9	-26/+37
\| \|\ \ \
\| * \| \| \|	fix forgotten spelling.	Michael	2014-08-28	1	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge pull request #398 from betheg/fix_res	Daniel Gultsch	2014-08-31	9	-17/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix: warning: string 'publish_avatar' has no default translation.
\| * \| \| \| \|	fix: warning: string 'publish_avatar' has no default translation.	Michael	2014-08-30	9	-17/+13
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	also altered the types of resources from array to string-array in some res-files.
* \| \| \| \|	require encrypted to be the same for messages to get merged	iNPUTmice	2014-08-31	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	experimental message merging	iNPUTmice	2014-08-31	3	-44/+112
\|/ / / /
* \| \| \|	version bump to 0.7-alpha	iNPUTmice	2014-08-30	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'sm' into development	iNPUTmice	2014-08-30	3	-146/+250
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
\| * \| \| \|	reset unsend messages to waiting	iNPUTmice	2014-08-30	2	-2/+17
\| \| \| \| \|
\| * \| \| \|	properly set stanza count on session resume	iNPUTmice	2014-08-30	1	-3/+21
\| \| \| \| \|
\| * \| \| \|	basic message acking	iNPUTmice	2014-08-30	3	-131/+200
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	proper namespaces for xep-0352	iNPUTmice	2014-08-30	3	-3/+3
\| \| \| \|
* \| \| \|	send inactive or active on every connect and resume	iNPUTmice	2014-08-30	1	-3/+10
\| \| \| \|
* \| \| \|	added basic csi	iNPUTmice	2014-08-30	4	-0/+86
\|/ / /
* \| \|	version bump to 0.6 with changelogs0.6	iNPUTmice	2014-08-30	3	-31/+27
\| \| \|
* \| \|	brought npe catcher back for kxml parser	iNPUTmice	2014-08-30	1	-0/+4
\| \|/ \|/\|
* \|	fixed link to old resource	iNPUTmice	2014-08-29	1	-2/+2
\| \|
* \|	fixed npe	iNPUTmice	2014-08-29	1	-0/+4
\| \|
* \|	more swedish translations	iNPUTmice	2014-08-29	1	-0/+3
\| \|
* \|	fixed #389	iNPUTmice	2014-08-29	6	-6/+10
\| \|
* \|	Merge pull request #394 from suraia/translation-de	Daniel Gultsch	2014-08-29	1	-19/+19
\|\ \ \| \|/ \|/\|	Fix some typos in the German translation.
\| *	Fix some typos in the German translation.	Michael Kuhn	2014-08-28	1	-19/+19
\|/
*	fixed spelling thanks @betheg	iNPUTmice	2014-08-28	8	-67/+63
\|
*	formating in strings file	iNPUTmice	2014-08-28	1	-3/+3
\|
*	Merge branch 'development' of https://github.com/beriain/Conversations into ↵	iNPUTmice	2014-08-28	1	-12/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	development Conflicts: res/values-eu/strings.xml
\| *	Update strings.xml	Aitor Beriain	2014-08-27	1	-20/+20
\| \|
* \|	translated missing string in settings	iNPUTmice	2014-08-27	5	-44/+39
\| \|
* \|	added swedish translations by Anders Sandblad @andersruneson	iNPUTmice	2014-08-27	1	-1/+24
\| \|
* \|	added missing string to german translation	iNPUTmice	2014-08-26	1	-0/+1
\| \|
* \|	Merge pull request #385 from rostovtsev/development	Daniel Gultsch	2014-08-26	1	-23/+59
\|\ \ \| \| \| \| \| \|	russian translation for 0.6
\| * \|	Updated to 0.6.1	Ilia	2014-08-26	1	-23/+59
\|/ / \| \| \| \| \| \|	1. Different bug fixed. 2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
* \|	Merge pull request #384 from wapolinar/typos	Daniel Gultsch	2014-08-26	1	-11/+11
\|\ \ \| \| \| \| \| \|	Typos in readme.
\| * \|	Typos in readme.	Wolfgang Apolinarski	2014-08-26	1	-11/+11
\|/ /
* \|	removed deprecated strings from translations	iNPUTmice	2014-08-26	6	-49/+1
\| \|
* \|	Merge pull request #376 from wapolinar/development	Daniel Gultsch	2014-08-25	1	-1/+1
\|\ \ \| \| \| \| \| \|	Update strings.xml
\| * \|	Update strings.xml	wapolinar	2014-08-25	1	-1/+1
\| \| \| \| \| \| \| \| \|	Typo in a key for the German translation.
* \| \|	Merge pull request #377 from kruks23/translation2	Daniel Gultsch	2014-08-25	1	-11/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
\| * \| \|	Update Spanish Translations	kruks23	2014-08-25	1	-11/+6
\|/ / /
* / /	fixing duplicate private muc messages	iNPUTmice	2014-08-25	1	-3/+10
\|/ /