268 Commits

Author	SHA1	Message	Date
Daniel Gultsch	9b53ebd44b	Merge pull request #299 from beriain/development ... Update strings.xml	2014-07-22 15:30:23 +02:00
Aitor Beriain	db91c15fcf	Update strings.xml	2014-07-22 15:12:19 +02:00
iNPUTmice	b223784560	added hint to explain the contact has read up to this point	2014-07-21 19:54:26 +02:00
iNPUTmice	2fe20ffa8e	fixed #267	2014-07-21 16:16:09 +02:00
iNPUTmice	9ddd2f195e	fixed typos reported by @jelmer fixed #288	2014-07-20 12:21:04 +02:00
Daniel Gultsch	0ee7cd136a	Merge pull request #289 from jelmer/dutch ... Add Dutch translations.	2014-07-20 12:17:14 +02:00
Jelmer Vernooij	cb0a87d7ff	Add Dutch translations.	2014-07-20 04:00:05 +02:00
kruks23	88857e7721	Update Spanish Translations	2014-07-18 18:36:22 +02:00
iNPUTmice	6b74c0594e	show snackbar if conference was not found	2014-07-18 12:44:33 +02:00
iNPUTmice	38a9242955	brought muc invites back. + couple of bug fixes + refactoring	2014-07-17 00:03:37 +02:00
kruks23	4e321c5187	Update Spanish Translations	2014-07-16 16:31:18 +02:00
iNPUTmice	e79a34b651	redesigned muc details a little bit	2014-07-16 12:34:09 +02:00
Daniel Gultsch	eb8253d49a	Merge pull request #278 from rostovtsev/development ... Russian Translations, fixed typos for English version	2014-07-15 22:33:49 +02:00
Ilia	31b5322570	Russian Localization	2014-07-16 00:10:06 +04:00
Ilia	88a556ec1e	Double-checked Russian localization	2014-07-16 00:06:43 +04:00
Ilia	eab756a1c5	Fixed typo Ouf -> Out	2014-07-15 22:59:32 +04:00
iNPUTmice	fc5143734e	added confirm dialog before contact and bookmark removal	2014-07-15 19:41:58 +02:00
Ilia	b6059a5687	Fixed typo mange -> manage	2014-07-15 19:48:45 +04:00
Ilia	a5d7b9b775	Fixed typo Decrpytion -> Decryption	2014-07-15 19:33:48 +04:00
Ilia	ed39920e6a	Update strings.xml	2014-07-15 19:18:24 +04:00
Ilia	ae0c660cf4	Russian Translation for Conversations ... Russian Translation for Conversations - an open source XMPP client for Android 4.0+ smart phones.	2014-07-15 18:09:48 +04:00
Ilia	3c9df212ab	Delete values-ru	2014-07-15 18:04:35 +04:00
Ilia	cdfaa98736	strings.xml ... Russian translation for Conversations	2014-07-15 18:04:08 +04:00
Daniel Gultsch	908bd59d21	Merge pull request #275 from BenoitBouvarel/development ... Update french translation	2014-07-15 15:13:59 +02:00
Benoit Bouvarel	05e2aef9f8	Update strings.xml	2014-07-15 14:41:30 +02:00
iNPUTmice	2ebd92b7a7	pushing bookmarks back to server	2014-07-15 14:32:19 +02:00
iNPUTmice	3fa3d5f02b	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-14 11:48:01 +02:00
iNPUTmice	e2f886d121	fetch bookmarks from server	2014-07-14 11:47:42 +02:00
kruks23	c4d6775f7d	Update Spanish Translations	2014-07-13 13:29:06 +02:00
iNPUTmice	4e910eee59	fixed #268	2014-07-12 17:08:01 +02:00
iNPUTmice	7a26f27212	switch SearchView with custom action view	2014-07-11 23:44:59 +02:00
iNPUTmice	610df2eddc	added join conference dialog	2014-07-11 19:48:41 +02:00
iNPUTmice	0193e0291c	cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites	2014-07-11 14:07:52 +02:00
iNPUTmice	e7a0040ec5	fixed #255 and made some other improvements to the subscription mgmt	2014-07-11 13:52:27 +02:00
Daniel Gultsch	8ebd14cef4	Merge pull request #262 from kruks23/development ... Show time in messages previous days	2014-07-11 13:12:25 +02:00
iNPUTmice	a523127a80	fixed #38	2014-07-10 19:42:37 +02:00
kruks23	1da0845d52	Update Spanish Translations	2014-07-10 18:12:57 +02:00
iNPUTmice	e97b524455	added create contact dialog	2014-07-10 13:19:42 +02:00
iNPUTmice	f8763015eb	added contextual menu for contacts	2014-07-10 01:55:19 +02:00
iNPUTmice	2684ecda1e	small changes	2014-07-10 00:53:44 +02:00
iNPUTmice	7b8ed5ffbc	theming for tabs in start conversation	2014-07-10 00:53:44 +02:00
iNPUTmice	3bdf84b6a0	filter contacts and starting confercenes	2014-07-10 00:53:44 +02:00
iNPUTmice	7c3f3b2a3e	added group add button	2014-07-10 00:53:43 +02:00
iNPUTmice	c1ee9e682a	added action bar menu to start conversation	2014-07-10 00:53:43 +02:00
iNPUTmice	502a1bdb9c	changed support lib to v13. added tabs and fragments to start conversation activity	2014-07-10 00:53:43 +02:00
iNPUTmice	2c50ba1779	moved hint box to the bottom	2014-07-10 00:13:30 +02:00
iNPUTmice	da79e2cca2	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-09 21:45:21 +02:00
iNPUTmice	6e3e1d310a	unified warnings/error msgs	2014-07-09 21:45:03 +02:00
Daniel Gultsch	0372756754	Merge pull request #245 from beriain/development ... Update strings.xml and fix some strings	2014-07-08 17:00:47 +02:00
iNPUTmice	3ac70d4b86	uniformed colors. made colors a little material	2014-07-08 11:41:19 +02:00