Commit Graph

4055 Commits

Author SHA1 Message Date
iNPUTmice
542cbef53b hide verify snackbar when otr session is ended. fixed npe 2014-07-20 12:36:57 +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
iNPUTmice
b5005d60de simplified presence subscription in contact details 2014-07-20 03:14:47 +02:00
iNPUTmice
185c485fc6 fixed #254 2014-07-20 02:34:07 +02:00
iNPUTmice
22e504b8f9 ignore groupchats messages that are pending leave 2014-07-20 02:26:23 +02:00
iNPUTmice
1cfe557b2b Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-18 21:57:27 +02:00
iNPUTmice
c65600edc9 pending leaves and joins for muc 2014-07-18 21:57:10 +02:00
iNPUTmice
9cfb4ee6c3 only show muc errors if actually connected 2014-07-18 19:36:29 +02:00
Daniel Gultsch
2f514381a2 Merge pull request #285 from kruks23/development
Update Spanish Translations
2014-07-18 19:01:39 +02:00
kruks23
88857e7721 Update Spanish Translations 2014-07-18 18:36:22 +02:00
iNPUTmice
b561d15720 added russian translator to readme 2014-07-18 15:47:45 +02:00
iNPUTmice
4307b1de72 notify ui on roster changes 2014-07-18 15:35:31 +02:00
iNPUTmice
6b74c0594e show snackbar if conference was not found 2014-07-18 12:44:33 +02:00
Dominik Schürmann
cd1a6748dd Extend for NFC 2014-07-17 20:29:59 +02:00
iNPUTmice
38a9242955 brought muc invites back. + couple of bug fixes + refactoring 2014-07-17 00:03:37 +02:00
iNPUTmice
670dead695 improvements on the dublicate muc messages issue 2014-07-16 19:03:14 +02:00
Daniel Gultsch
6c89978489 Merge pull request #280 from kruks23/development
Update Spanish Translations
2014-07-16 19:02:28 +02:00
kruks23
4e321c5187 Update Spanish Translations 2014-07-16 16:31:18 +02:00
iNPUTmice
ebca6fa5da spelling 2014-07-16 13:32:20 +02:00
iNPUTmice
02351de94b made grace period work for muc as well 2014-07-16 12:45:56 +02:00
iNPUTmice
0ec1c022b9 fixed rare npe 2014-07-16 12:42:44 +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
iNPUTmice
9532a9889b couple of bug fixes related to muc renaming 2014-07-15 21:54:11 +02:00
Ilia
eab756a1c5 Fixed typo Ouf -> Out 2014-07-15 22:59:32 +04:00
iNPUTmice
177e802a77 fixed #276 2014-07-15 20:41:32 +02:00
iNPUTmice
e20842608b unregister bookmark on conversation when bookmark is deleted 2014-07-15 20:41:10 +02: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
iNPUTmice
ed4d0d38e3 bug fix on deleting conference bookmarks 2014-07-15 17:19:47 +02:00
Ilia
ed39920e6a Update strings.xml 2014-07-15 19:18:24 +04:00
iNPUTmice
6f5d7071af Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-15 17:11:59 +02:00
iNPUTmice
2a82f23f36 use nick from bookmark if available 2014-07-15 17:11:43 +02: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
6031af8606 use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set 2014-07-14 17:13:59 +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
iNPUTmice
876a076e12 fixed spelling in README and added mission statement to docs 2014-07-14 11:45:55 +02:00
Daniel Gultsch
4c99d9e242 Merge pull request #273 from kruks23/development
Update Spanish Translations
2014-07-13 13:58:28 +02:00
kruks23
c4d6775f7d Update Spanish Translations 2014-07-13 13:29:06 +02:00