conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	brought settings and manage account menu items back	iNPUTmice	2014-07-22	2	-8/+4
*	fixed #301	iNPUTmice	2014-07-22	1	-1/+2
*	refactored message adapter into seperate class	Daniel Gultsch	2014-07-22	3	-445/+498
*	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2014-07-22	1	-14/+39
\|\
\| *	Merge pull request #299 from beriain/development	Daniel Gultsch	2014-07-22	1	-14/+39
\| \|\
\| \| *	Update strings.xml	Aitor Beriain	2014-07-22	1	-14/+39
* \| \|	Merge branch 'master' into development	Daniel Gultsch	2014-07-22	2	-3/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	version bump to 0.5-beta and changelog0.5-beta	iNPUTmice	2014-07-21	2	-3/+8
* \| \|	save login nick for mucs during join	iNPUTmice	2014-07-21	1	-0/+5
\|/ /
* \|	back to normal invites. fixed #298	iNPUTmice	2014-07-21	1	-1/+14
* \|	added hint to explain the contact has read up to this point	iNPUTmice	2014-07-21	2	-0/+8
* \|	fixed #292	iNPUTmice	2014-07-21	1	-0/+10
* \|	fixed #267	iNPUTmice	2014-07-21	3	-1/+15
* \|	switched to direct invites. fixes #284	iNPUTmice	2014-07-21	4	-16/+27
* \|	fixed bug where presence requests where sent on display of contact details	iNPUTmice	2014-07-21	1	-2/+5
* \|	fixed #290	iNPUTmice	2014-07-21	1	-1/+1
* \|	disable subscription checkboxes when account is offline	iNPUTmice	2014-07-20	1	-0/+24
* \|	hide verify snackbar when otr session is ended. fixed npe	iNPUTmice	2014-07-20	2	-0/+4
* \|	fixed typos reported by @jelmer fixed #288	iNPUTmice	2014-07-20	1	-2/+2
* \|	Merge pull request #289 from jelmer/dutch	Daniel Gultsch	2014-07-20	3	-0/+294
\|\ \
\| * \|	Add Dutch translations.	Jelmer Vernooij	2014-07-20	3	-0/+294
* \| \|	simplified presence subscription in contact details	iNPUTmice	2014-07-20	2	-106/+83
* \| \|	fixed #254	iNPUTmice	2014-07-20	2	-6/+18
* \| \|	ignore groupchats messages that are pending leave	iNPUTmice	2014-07-20	3	-25/+30
* \| \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-18	2	-5/+5
\|\ \ \
\| * \ \	Merge pull request #285 from kruks23/development	Daniel Gultsch	2014-07-18	2	-5/+5
\| \|\ \ \
\| \| * \| \|	Update Spanish Translations	kruks23	2014-07-18	2	-5/+5
\| \|/ / /
* \| \| \|	pending leaves and joins for muc	iNPUTmice	2014-07-18	5	-56/+71
* \| \| \|	only show muc errors if actually connected	iNPUTmice	2014-07-18	1	-25/+34
\|/ / /
* \| \|	added russian translator to readme	iNPUTmice	2014-07-18	1	-0/+1
* \| \|	notify ui on roster changes	iNPUTmice	2014-07-18	5	-0/+55
* \| \|	show snackbar if conference was not found	iNPUTmice	2014-07-18	4	-5/+19
* \| \|	brought muc invites back. + couple of bug fixes + refactoring	iNPUTmice	2014-07-17	21	-145/+318
* \| \|	improvements on the dublicate muc messages issue	iNPUTmice	2014-07-16	1	-4/+11
* \| \|	Merge pull request #280 from kruks23/development	Daniel Gultsch	2014-07-16	1	-1/+6
\|\ \ \
\| * \| \|	Update Spanish Translations	kruks23	2014-07-16	1	-1/+6
\|/ / /
* \| \|	spelling	iNPUTmice	2014-07-16	1	-2/+2
* \| \|	made grace period work for muc as well	iNPUTmice	2014-07-16	1	-0/+2
* \| \|	fixed rare npe	iNPUTmice	2014-07-16	1	-0/+3
* \| \|	redesigned muc details a little bit	iNPUTmice	2014-07-16	17	-333/+362
* \| \|	Merge pull request #278 from rostovtsev/development	Daniel Gultsch	2014-07-15	3	-4/+297
\|\ \ \
\| * \| \|	Russian Localization	Ilia	2014-07-16	1	-0/+22
\| * \| \|	Double-checked Russian localization	Ilia	2014-07-16	1	-196/+196
\| * \| \|	Fixed typo Ouf -> Out	Ilia	2014-07-15	1	-1/+1
\| * \| \|	Fixed typo mange -> manage	Ilia	2014-07-15	1	-1/+1
\| * \| \|	Fixed typo Decrpytion -> Decryption	Ilia	2014-07-15	1	-2/+2
\| * \| \|	Update strings.xml	Ilia	2014-07-15	1	-86/+85
\| * \| \|	Russian Translation for Conversations	Ilia	2014-07-15	1	-0/+272
\| * \| \|	Delete values-ru	Ilia	2014-07-15	1	-272/+0
\| * \| \|	strings.xml	Ilia	2014-07-15	1	-0/+272