conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rostovtsev-development' into development	iNPUTmice	2014-07-24	1	-0/+12
\|\
\| *	Merge branch 'development' of https://github.com/rostovtsev/Conversations ↵	iNPUTmice	2014-07-24	1	-0/+12
\|/\| \| \| \| \| \| \| \| \| \| \| \| \|	into rostovtsev-development Conflicts: res/values-ru/strings.xml
\| *	Update strings.xml	Ilia	2014-07-24	1	-2/+2
\| \|
\| *	Added translations	Ilia	2014-07-24	1	-0/+14
\| \| \| \| \| \|	Added translations per issue #309 - Missing Translations
* \|	added jelmer to the list of translators	iNPUTmice	2014-07-24	1	-0/+1
\| \|
* \|	removed more legacy tls error handling stuff	iNPUTmice	2014-07-24	3	-9/+0
\| \|
* \|	removed outdated tls error	iNPUTmice	2014-07-24	3	-11/+2
\| \|
* \|	removed outdated translations from languge files	iNPUTmice	2014-07-24	8	-108/+2
\| \|
* \|	presonalized read up to this point message	iNPUTmice	2014-07-24	2	-11/+8
\| \|
* \|	answer correctly if both markers and receipts are requested	iNPUTmice	2014-07-24	2	-13/+17
\| \|
* \|	fixed bug with otr session being initilized over and over again	iNPUTmice	2014-07-23	2	-11/+11
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-23	1	-13/+13
\|\ \
\| * \	Merge pull request #307 from Erkan-Yilmaz/development	Daniel Gultsch	2014-07-23	1	-13/+13
\| \|\ \ \| \| \| \| \| \| \| \|	typos
\| \| * \|	typos	Erkan Yilmaz	2014-07-23	1	-13/+13
\| \|/ /
* / /	more disco. fixed chat markers with jappix	iNPUTmice	2014-07-23	6	-18/+99
\|/ /
* \|	updated mtm	iNPUTmice	2014-07-22	1	-0/+0
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-22	1	-0/+3
\|\ \
\| * \	Merge pull request #303 from kruks23/development	Daniel Gultsch	2014-07-22	1	-0/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
\| \| * \|	Update Spanish Translations	kruks23	2014-07-22	1	-0/+3
\| \| \| \|
* \| \| \|	some cleanup	iNPUTmice	2014-07-22	2	-43/+0
\|/ / /
* / /	switched to mtm	iNPUTmice	2014-07-22	7	-142/+32
\|/ /
* \|	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
\| \| * \|	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.
\| * \| \|	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
\| \| * \| \| \|	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
\|/ / / /