Commit graph

  • 39aeb4cc3d Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-26 10:30:05 +02:00
  • 251b8fd58b Merge pull request #315 from jelmer/dutch Daniel Gultsch 2014-07-26 10:29:31 +02:00
  • 60e94ee9b8 Update Dutch translations. Jelmer Vernooij 2014-07-26 04:06:55 +02:00
  • 0e1c8467a3 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-25 08:11:45 +02:00
  • deb5046e95 Merge pull request #313 from suraia/translation-de Daniel Gultsch 2014-07-25 08:08:10 +02:00
  • 1b0b847880 Update German translation. Michael Kuhn 2014-07-24 21:09:26 +02:00
  • 16e5139d5e version bump to 0.5 iNPUTmice 2014-07-24 19:37:11 +02:00
  • 36434d8576 Merge pull request #312 from beriain/development Daniel Gultsch 2014-07-24 19:35:29 +02:00
  • 881e610636 Some corrections Aitor Beriain 2014-07-24 17:34:57 +02:00
  • a6f8954bee updated screenshots iNPUTmice 2014-07-24 17:24:52 +02:00
  • 52ad718251 removed duplicates from muc suggestions iNPUTmice 2014-07-24 17:21:21 +02:00
  • c7c3db478a included version string in crash reports iNPUTmice 2014-07-24 12:33:56 +02:00
  • 438538e2da french translations by @BenoitBouvarel fixed #311 iNPUTmice 2014-07-24 11:48:56 +02:00
  • 39841e6f57 fixed spanish string. wild guessed + google translate fix for basque iNPUTmice 2014-07-24 10:16:05 +02:00
  • 9f9dc8f5c0 added some translations back that have been removed be accident iNPUTmice 2014-07-24 10:04:01 +02:00
  • 4c84cf78e0 Merge branch 'rostovtsev-development' into development iNPUTmice 2014-07-24 09:56:05 +02:00
  • 76de9dba79 Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development iNPUTmice 2014-07-24 09:55:45 +02:00
  • 4d0d35f6bc Update strings.xml Ilia 2014-07-24 10:46:13 +04:00
  • 1a04b071a5 Added translations Ilia 2014-07-24 10:44:39 +04:00
  • 8d5f2a9195 added jelmer to the list of translators iNPUTmice 2014-07-24 01:41:56 +02:00
  • d108a5f2b6 removed more legacy tls error handling stuff iNPUTmice 2014-07-24 01:39:46 +02:00
  • deab99c997 removed outdated tls error iNPUTmice 2014-07-24 01:37:38 +02:00
  • 3b786c34f2 removed outdated translations from languge files iNPUTmice 2014-07-24 01:35:09 +02:00
  • 983104f2f0 presonalized read up to this point message iNPUTmice 2014-07-24 01:17:34 +02:00
  • 7ee2ef5233 answer correctly if both markers and receipts are requested iNPUTmice 2014-07-24 01:04:25 +02:00
  • 1665f2e1b3 Merge branch 'v0.1' Rene Treffer 2014-07-23 22:49:36 +02:00
  • 2bddcc9f99 Add parsing for mdns QU records (RFC6762) Rene Treffer 2014-07-23 22:43:12 +02:00
  • 70d403f0b6 Better / more verbose toString Rene Treffer 2014-07-23 21:53:38 +02:00
  • 23e5fb5d56 fixed bug with otr session being initilized over and over again iNPUTmice 2014-07-23 18:04:29 +02:00
  • b6e3ce4b20 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-23 14:31:08 +02:00
  • 5c118f6dd7 more disco. fixed chat markers with jappix iNPUTmice 2014-07-23 14:30:27 +02:00
  • 01a03e5ded Merge pull request #307 from Erkan-Yilmaz/development Daniel Gultsch 2014-07-23 13:26:33 +02:00
  • a81a667c41 typos Erkan Yilmaz 2014-07-23 10:07:27 +02:00
  • b0f8bec1cb Add TXT record Rene Treffer 2014-07-23 00:00:55 +02:00
  • bfcba9169d Add TXT record Rene Treffer 2014-07-23 00:00:55 +02:00
  • f13813186f Add PTR record parsing Rene Treffer 2014-07-22 23:22:35 +02:00
  • 6eda21b416 Add PTR record parsing Rene Treffer 2014-07-22 23:22:35 +02:00
  • 04156e945c updated mtm iNPUTmice 2014-07-22 19:08:09 +02:00
  • eacf56bf37 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-22 18:58:38 +02:00
  • 1f4ea552cd some cleanup iNPUTmice 2014-07-22 18:58:20 +02:00
  • 869ab96e6d Add values for NFC support Dominik Schürmann 2014-07-22 18:10:06 +02:00
  • ce2b96265a Merge pull request #303 from kruks23/development Daniel Gultsch 2014-07-22 18:07:38 +02:00
  • ae532ecf20 Update Spanish Translations kruks23 2014-07-22 17:47:25 +02:00
  • 4607e2c546 switched to mtm iNPUTmice 2014-07-22 17:27:44 +02:00
  • 9fcc195a6d brought settings and manage account menu items back iNPUTmice 2014-07-22 17:23:31 +02:00
  • 2345398652 fixed #301 iNPUTmice 2014-07-22 16:55:30 +02:00
  • 84642b7492 refactored message adapter into seperate class Daniel Gultsch 2014-07-22 15:31:54 +02:00
  • 9e1c668613 Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-07-22 15:29:52 +02:00
  • 9b53ebd44b Merge pull request #299 from beriain/development Daniel Gultsch 2014-07-22 15:30:23 +02:00
  • db91c15fcf Update strings.xml Aitor Beriain 2014-07-22 15:12:19 +02:00
  • c3ef8e0a5b Merge branch 'master' into development Daniel Gultsch 2014-07-22 14:48:07 +02:00
  • 66e3ccc2dc save login nick for mucs during join iNPUTmice 2014-07-21 22:57:41 +02:00
  • 34dafc24af version bump to 0.5-beta and changelog iNPUTmice 2014-07-21 20:30:51 +02:00
  • e3ebccc762 back to normal invites. fixed #298 iNPUTmice 2014-07-21 19:55:00 +02:00
  • b223784560 added hint to explain the contact has read up to this point iNPUTmice 2014-07-21 19:54:26 +02:00
  • a787f58a90 fixed #292 iNPUTmice 2014-07-21 18:20:26 +02:00
  • 2fe20ffa8e fixed #267 iNPUTmice 2014-07-21 16:16:09 +02:00
  • f9ed76f5e1 switched to direct invites. fixes #284 iNPUTmice 2014-07-21 16:04:53 +02:00
  • 87aff4c6d8 fixed bug where presence requests where sent on display of contact details iNPUTmice 2014-07-21 15:17:01 +02:00
  • aa844df144 fixed #290 iNPUTmice 2014-07-21 15:16:06 +02:00
  • 3b7f89bbb0 disable subscription checkboxes when account is offline iNPUTmice 2014-07-20 13:21:21 +02:00
  • 542cbef53b hide verify snackbar when otr session is ended. fixed npe iNPUTmice 2014-07-20 12:36:57 +02:00
  • 9ddd2f195e fixed typos reported by @jelmer fixed #288 iNPUTmice 2014-07-20 12:21:04 +02:00
  • 0ee7cd136a Merge pull request #289 from jelmer/dutch Daniel Gultsch 2014-07-20 12:17:14 +02:00
  • cb0a87d7ff Add Dutch translations. Jelmer Vernooij 2014-07-20 03:14:07 +02:00
  • b5005d60de simplified presence subscription in contact details iNPUTmice 2014-07-20 03:14:47 +02:00
  • 185c485fc6 fixed #254 iNPUTmice 2014-07-20 02:34:07 +02:00
  • 22e504b8f9 ignore groupchats messages that are pending leave iNPUTmice 2014-07-20 02:26:23 +02:00
  • 1cfe557b2b Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-18 21:57:27 +02:00
  • c65600edc9 pending leaves and joins for muc iNPUTmice 2014-07-18 21:57:10 +02:00
  • 9cfb4ee6c3 only show muc errors if actually connected iNPUTmice 2014-07-18 19:36:29 +02:00
  • 2f514381a2 Merge pull request #285 from kruks23/development Daniel Gultsch 2014-07-18 19:01:39 +02:00
  • 88857e7721 Update Spanish Translations kruks23 2014-07-18 18:36:22 +02:00
  • b561d15720 added russian translator to readme iNPUTmice 2014-07-18 15:47:45 +02:00
  • 4307b1de72 notify ui on roster changes iNPUTmice 2014-07-18 15:35:31 +02:00
  • 6b74c0594e show snackbar if conference was not found iNPUTmice 2014-07-18 12:44:33 +02:00
  • cd1a6748dd Extend for NFC Dominik Schürmann 2014-07-17 20:29:59 +02:00
  • 38a9242955 brought muc invites back. + couple of bug fixes + refactoring iNPUTmice 2014-07-17 00:03:37 +02:00
  • 670dead695 improvements on the dublicate muc messages issue iNPUTmice 2014-07-16 19:03:14 +02:00
  • 6c89978489 Merge pull request #280 from kruks23/development Daniel Gultsch 2014-07-16 19:02:28 +02:00
  • 4e321c5187 Update Spanish Translations kruks23 2014-07-16 16:31:18 +02:00
  • ebca6fa5da spelling iNPUTmice 2014-07-16 13:32:20 +02:00
  • 02351de94b made grace period work for muc as well iNPUTmice 2014-07-16 12:45:56 +02:00
  • 0ec1c022b9 fixed rare npe iNPUTmice 2014-07-16 12:42:44 +02:00
  • e79a34b651 redesigned muc details a little bit iNPUTmice 2014-07-16 12:34:09 +02:00
  • eb8253d49a Merge pull request #278 from rostovtsev/development Daniel Gultsch 2014-07-15 22:33:49 +02:00
  • 31b5322570 Russian Localization Ilia 2014-07-16 00:10:06 +04:00
  • 88a556ec1e Double-checked Russian localization Ilia 2014-07-16 00:06:43 +04:00
  • 9532a9889b couple of bug fixes related to muc renaming iNPUTmice 2014-07-15 21:54:11 +02:00
  • eab756a1c5 Fixed typo Ouf -> Out Ilia 2014-07-15 22:59:32 +04:00
  • 177e802a77 fixed #276 iNPUTmice 2014-07-15 20:41:32 +02:00
  • e20842608b unregister bookmark on conversation when bookmark is deleted iNPUTmice 2014-07-15 20:41:10 +02:00
  • fc5143734e added confirm dialog before contact and bookmark removal iNPUTmice 2014-07-15 19:41:58 +02:00
  • b6059a5687 Fixed typo mange -> manage Ilia 2014-07-15 19:48:45 +04:00
  • a5d7b9b775 Fixed typo Decrpytion -> Decryption Ilia 2014-07-15 19:33:48 +04:00
  • ed4d0d38e3 bug fix on deleting conference bookmarks iNPUTmice 2014-07-15 17:19:47 +02:00
  • ed39920e6a Update strings.xml Ilia 2014-07-15 19:18:24 +04:00
  • 6f5d7071af Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-07-15 17:11:59 +02:00
  • 2a82f23f36 use nick from bookmark if available iNPUTmice 2014-07-15 17:11:43 +02:00
  • ae0c660cf4 Russian Translation for Conversations Ilia 2014-07-15 18:09:48 +04:00