conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \|	added hint to explain the contact has read up to this point	iNPUTmice	2014-07-21	1	-0/+1
* \|	fixed #267	iNPUTmice	2014-07-21	1	-0/+2
* \|	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
* \| \|	Update Spanish Translations	kruks23	2014-07-18	2	-5/+5
* \| \|	show snackbar if conference was not found	iNPUTmice	2014-07-18	1	-0/+2
* \| \|	brought muc invites back. + couple of bug fixes + refactoring	iNPUTmice	2014-07-17	5	-28/+42
* \| \|	Update Spanish Translations	kruks23	2014-07-16	1	-1/+6
* \| \|	redesigned muc details a little bit	iNPUTmice	2014-07-16	12	-161/+142
* \| \|	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
* \| \| \|	added confirm dialog before contact and bookmark removal	iNPUTmice	2014-07-15	1	-1/+2
\|/ / /
* \| \|	Merge pull request #275 from BenoitBouvarel/development	Daniel Gultsch	2014-07-15	1	-4/+22
\|\ \ \
\| * \| \|	Update strings.xml	Benoit Bouvarel	2014-07-15	1	-4/+22
* \| \| \|	pushing bookmarks back to server	iNPUTmice	2014-07-15	1	-0/+1
* \| \| \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-14	1	-1/+5
\|\ \ \ \
\| * \| \| \|	Update Spanish Translations	kruks23	2014-07-13	1	-1/+5
* \| \| \| \|	fetch bookmarks from server	iNPUTmice	2014-07-14	3	-1/+14
\|/ / / /
* \| \| \|	fixed #268	iNPUTmice	2014-07-12	1	-0/+0
* \| \| \|	switch SearchView with custom action view	iNPUTmice	2014-07-11	2	-1/+20
* \| \| \|	added join conference dialog	iNPUTmice	2014-07-11	4	-5/+56
* \| \| \|	cleanup. removed old contacts activity. WARNING: this will temporarly disable...	iNPUTmice	2014-07-11	3	-92/+0
* \| \| \|	fixed #255 and made some other improvements to the subscription mgmt	iNPUTmice	2014-07-11	1	-12/+0
* \| \| \|	Merge pull request #262 from kruks23/development	Daniel Gultsch	2014-07-11	1	-3/+16
\|\ \ \ \
\| * \| \| \|	Update Spanish Translations	kruks23	2014-07-10	1	-3/+16
* \| \| \| \|	fixed #38	iNPUTmice	2014-07-10	2	-6/+4
\|/ / / /
* \| \| \|	added create contact dialog	iNPUTmice	2014-07-10	2	-3/+42
* \| \| \|	added contextual menu for contacts	iNPUTmice	2014-07-10	2	-0/+16
* \| \| \|	small changes	iNPUTmice	2014-07-10	2	-9/+12
* \| \| \|	theming for tabs in start conversation	iNPUTmice	2014-07-10	26	-12/+34
* \| \| \|	filter contacts and starting confercenes	iNPUTmice	2014-07-10	1	-6/+6
* \| \| \|	added group add button	iNPUTmice	2014-07-10	2	-16/+21
* \| \| \|	added action bar menu to start conversation	iNPUTmice	2014-07-10	2	-0/+29
* \| \| \|	changed support lib to v13. added tabs and fragments to start conversation ac...	iNPUTmice	2014-07-10	2	-1/+10
* \| \| \|	moved hint box to the bottom	iNPUTmice	2014-07-10	2	-50/+63
* \| \| \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-09	1	-5/+11
\|\ \ \ \
\| * \ \ \	Merge pull request #245 from beriain/development	Daniel Gultsch	2014-07-08	1	-5/+11
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Update strings.xml	Aitor Beriain	2014-07-07	1	-5/+11
* \| \| \| \|	unified warnings/error msgs	iNPUTmice	2014-07-09	9	-124/+33
\|/ / / /