conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	Merge pull request #743 from weiss/update-german-translations	Daniel Gultsch	2014-12-03	1	-2/+4
\|\ \ \
\| * \| \|	Update/improve German translations	Holger Weiß	2014-12-02	1	-2/+4
\| \|/ /
* \| \|	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-12-03	3	-32/+109
\|\\| \|
\| * \|	Merge pull request #737 from kruks23/translation2	Daniel Gultsch	2014-12-02	1	-9/+11
\| \|\ \
\| \| * \|	Update spanish translations	kruks23	2014-12-01	1	-9/+11
\| * \| \|	Merge pull request #730 from svetlemodry/development	Daniel Gultsch	2014-12-02	2	-23/+98
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	pref_about_message string deleted	Jaroslav Lichtblau	2014-12-01	1	-24/+0
\| \| * \|	Added Czech translator name	Jaroslav Lichtblau	2014-12-01	1	-0/+1
\| \| * \|	Updated Czech translation file	Jaroslav Lichtblau	2014-12-01	1	-23/+121
* \| \| \|	safety net in joinMuc	iNPUTmice	2014-12-03	1	-4/+6
* \| \| \|	clean up getProposedNick	iNPUTmice	2014-12-03	1	-6/+5
* \| \| \|	fixed potential npes in message parser	iNPUTmice	2014-12-03	1	-2/+7
* \| \| \|	cleaned up avatar / tile creation	iNPUTmice	2014-12-03	2	-20/+9
\|/ / /
* \| \|	fixed #728	iNPUTmice	2014-12-01	1	-5/+2
* \| \|	bumped cap version as well0.9.1	iNPUTmice	2014-12-01	1	-1/+1
* \| \|	version bump to 0.9.1 and changelog	iNPUTmice	2014-12-01	2	-2/+5
* \| \|	clear encrypted messages on reinit	iNPUTmice	2014-12-01	1	-2/+13
* \| \|	worked around rare npe	iNPUTmice	2014-12-01	1	-5/+12
* \| \|	fixed npe if roster jid couldnt be parsed	iNPUTmice	2014-12-01	1	-8/+5
* \| \|	fixed italian translation	iNPUTmice	2014-12-01	1	-5/+5
* \| \|	Merge pull request #726 from Elinvention/development	Daniel Gultsch	2014-12-01	2	-10/+89
\|\ \ \
\| * \| \|	Removed pref_about_message which is not translatable	Elinvention	2014-11-30	1	-24/+0
\| * \| \|	Added missing italian translations with some minor fixes to existing ones	Elinvention	2014-11-30	2	-10/+113
\| \|/ /
* \| \|	do not query service info from main server again	iNPUTmice	2014-12-01	1	-5/+3
* \| \|	don't request fragment before updating	iNPUTmice	2014-11-30	1	-6/+2
\|/ /
* \|	Merge pull request #721 from SamWhited/warning_fixes	Daniel Gultsch	2014-11-29	4	-6/+14
\|\ \
\| * \|	Accessibility: Add missing image descriptions	Sam Whited	2014-11-29	3	-3/+8
\| * \|	Misc. "fixes" to correct warnings.	Sam Whited	2014-11-29	1	-3/+6
* \| \|	Merge pull request #718 from beriain/development	Daniel Gultsch	2014-11-29	1	-0/+6
\|\ \ \
\| * \| \|	Update basque translation	Aitor Beriain	2014-11-27	1	-0/+6
\| \|/ /
* \| \|	fixed npe for broken bookmarks	iNPUTmice	2014-11-29	1	-7/+8
* \| \|	version bump to 0.90.9	iNPUTmice	2014-11-29	2	-1/+10
* \| \|	fix for concurrency issue	iNPUTmice	2014-11-29	1	-1/+1
\|/ /
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-11-27	1	-1/+1
\|\ \
\| * \	Merge pull request #716 from kriztan/patch-3	Daniel Gultsch	2014-11-26	1	-1/+1
\| \|\ \
\| \| * \|	Update german translations	kriztan	2014-11-26	1	-1/+1
\| \|/ /
* \| \|	fixed npe. fixed #717	iNPUTmice	2014-11-27	1	-5/+6
* \| \|	create conversation with bare jid	iNPUTmice	2014-11-27	1	-1/+1
* \| \|	use getAttributeAsJid method	iNPUTmice	2014-11-27	1	-6/+1
\|/ /
* \|	Merge pull request #713 from betheg/muc	Daniel Gultsch	2014-11-24	5	-1/+65
\|\ \
\| * \|	add an listener for the muc roster update.	Michael	2014-11-23	4	-1/+63
\| * \|	MUC: do not add yourself to the muc user list.	Michael	2014-11-23	1	-0/+2
\| \|/
* \|	Merge pull request #714 from betheg/muc_bookmark_cd	Daniel Gultsch	2014-11-24	2	-0/+49
\|\ \
\| * \|	MUC: option to set/delete bookmark in conference details.	Michael	2014-11-23	2	-0/+49
\| \|/
* \|	Merge pull request #712 from kriztan/patch-2	Daniel Gultsch	2014-11-24	1	-0/+2
\|\ \ \| \|/ \|/\|
\| *	Update german translations	kriztan	2014-11-23	1	-0/+2
\|/
*	Merge pull request #709 from kruks23/translation	Daniel Gultsch	2014-11-22	1	-2/+8
\|\
\| *	Update spanish translations	kruks23	2014-11-22	1	-2/+8
\|/
*	work around to not confuse irc transport with real conference servers	iNPUTmice	2014-11-21	1	-2/+7
*	Merge pull request #706 from betheg/unused_imports	Daniel Gultsch	2014-11-21	12	-38/+0
\|\