Commit Graph

1120 Commits

Author SHA1 Message Date
iNPUTmice a6f8954bee updated screenshots 2014-07-24 17:24:52 +02:00
iNPUTmice 52ad718251 removed duplicates from muc suggestions 2014-07-24 17:21:21 +02:00
iNPUTmice c7c3db478a included version string in crash reports 2014-07-24 12:33:56 +02:00
iNPUTmice 438538e2da french translations by @BenoitBouvarel fixed #311 2014-07-24 11:48:56 +02:00
iNPUTmice 39841e6f57 fixed spanish string. wild guessed + google translate fix for basque 2014-07-24 10:16:05 +02:00
iNPUTmice 9f9dc8f5c0 added some translations back that have been removed be accident 2014-07-24 10:04:01 +02:00
iNPUTmice 4c84cf78e0 Merge branch 'rostovtsev-development' into development 2014-07-24 09:56:05 +02:00
iNPUTmice 76de9dba79 Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development
Conflicts:
	res/values-ru/strings.xml
2014-07-24 09:55:45 +02:00
Ilia 4d0d35f6bc Update strings.xml 2014-07-24 10:46:13 +04:00
Ilia 1a04b071a5 Added translations
Added translations per issue #309 - Missing Translations
2014-07-24 10:44:39 +04:00
iNPUTmice 8d5f2a9195 added jelmer to the list of translators 2014-07-24 01:41:56 +02:00
iNPUTmice d108a5f2b6 removed more legacy tls error handling stuff 2014-07-24 01:39:46 +02:00
iNPUTmice deab99c997 removed outdated tls error 2014-07-24 01:37:38 +02:00
iNPUTmice 3b786c34f2 removed outdated translations from languge files 2014-07-24 01:35:09 +02:00
iNPUTmice 983104f2f0 presonalized read up to this point message 2014-07-24 01:17:34 +02:00
iNPUTmice 7ee2ef5233 answer correctly if both markers and receipts are requested 2014-07-24 01:04:25 +02:00
iNPUTmice 23e5fb5d56 fixed bug with otr session being initilized over and over again 2014-07-23 18:04:29 +02:00
iNPUTmice b6e3ce4b20 Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-23 14:31:08 +02:00
iNPUTmice 5c118f6dd7 more disco. fixed chat markers with jappix 2014-07-23 14:30:27 +02:00
Daniel Gultsch 01a03e5ded Merge pull request #307 from Erkan-Yilmaz/development
typos
2014-07-23 13:26:33 +02:00
Erkan Yilmaz a81a667c41 typos 2014-07-23 10:07:27 +02:00
iNPUTmice 04156e945c updated mtm 2014-07-22 19:08:09 +02:00
iNPUTmice eacf56bf37 Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-22 18:58:38 +02:00
iNPUTmice 1f4ea552cd some cleanup 2014-07-22 18:58:20 +02:00
Daniel Gultsch ce2b96265a Merge pull request #303 from kruks23/development
Update Spanish Translations
2014-07-22 18:07:38 +02:00
kruks23 ae532ecf20 Update Spanish Translations 2014-07-22 17:47:25 +02:00
iNPUTmice 4607e2c546 switched to mtm 2014-07-22 17:27:44 +02:00
iNPUTmice 9fcc195a6d brought settings and manage account menu items back 2014-07-22 17:23:31 +02:00
iNPUTmice 2345398652 fixed #301 2014-07-22 16:55:30 +02:00
Daniel Gultsch 84642b7492 refactored message adapter into seperate class 2014-07-22 15:31:54 +02:00
Daniel Gultsch 9e1c668613 Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-22 15:29:52 +02:00
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
Daniel Gultsch c3ef8e0a5b Merge branch 'master' into development 2014-07-22 14:48:07 +02:00
iNPUTmice 66e3ccc2dc save login nick for mucs during join 2014-07-21 22:57:41 +02:00
iNPUTmice 34dafc24af version bump to 0.5-beta and changelog 2014-07-21 20:30:51 +02:00
iNPUTmice e3ebccc762 back to normal invites. fixed #298 2014-07-21 19:55:00 +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 a787f58a90 fixed #292 2014-07-21 18:20:26 +02:00
iNPUTmice 2fe20ffa8e fixed #267 2014-07-21 16:16:09 +02:00
iNPUTmice f9ed76f5e1 switched to direct invites. fixes #284 2014-07-21 16:04:53 +02:00
iNPUTmice 87aff4c6d8 fixed bug where presence requests where sent on display of contact details 2014-07-21 15:17:01 +02:00
iNPUTmice aa844df144 fixed #290 2014-07-21 15:16:06 +02:00
iNPUTmice 3b7f89bbb0 disable subscription checkboxes when account is offline 2014-07-20 13:21:21 +02:00
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