Commit Graph

  • 1cc16161ef require encrypted to be the same for messages to get merged iNPUTmice 2014-08-31 15:54:53 +0200
  • 8f8d4e320d experimental message merging iNPUTmice 2014-08-31 14:29:12 +0200
  • fb3c754ea8 Merge pull request #1 from Flowdalic/flow Dominik Schürmann 2014-08-30 18:56:17 +0200
  • 733041aee4 fix: warning: string 'publish_avatar' has no default translation. also altered the types of resources from array to string-array in some res-files. Michael 2014-08-30 17:38:21 +0200
  • d15482c22a Add my Real-name to the Copyright statement Florian Schmaus 2014-08-30 15:19:43 +0200
  • 969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-30 14:00:53 +0200
  • ec6220969d XEP-0172 Gayaz Yusipov 2014-08-30 14:26:46 +0400
  • 9eafb10086 version bump to 0.7-alpha iNPUTmice 2014-08-30 09:26:01 +0200
  • c494f4f7ae Merge branch 'sm' into development iNPUTmice 2014-08-30 09:24:58 +0200
  • 4435b0055e reset unsend messages to waiting iNPUTmice 2014-08-27 19:25:58 +0200
  • 9075d3854d properly set stanza count on session resume iNPUTmice 2014-08-27 14:51:00 +0200
  • 4a6a6c8403 basic message acking iNPUTmice 2014-08-26 16:52:42 +0200
  • 9de77b190b proper namespaces for xep-0352 iNPUTmice 2014-08-29 12:21:29 +0200
  • 6d82a69ba3 send inactive or active on every connect and resume iNPUTmice 2014-08-28 22:23:18 +0200
  • 265bd06250 added basic csi iNPUTmice 2014-08-26 17:43:44 +0200
  • 9ad5c6925d version bump to 0.6 with changelogs iNPUTmice 2014-08-30 08:51:55 +0200
  • 8840d082ba brought npe catcher back for kxml parser iNPUTmice 2014-08-30 08:31:05 +0200
  • 3714947d5f Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-29 23:30:47 +0200
  • 5450a2ae46 fixed link to old resource iNPUTmice 2014-08-29 14:05:10 +0200
  • b0d777d9ca fixed npe iNPUTmice 2014-08-29 12:14:10 +0200
  • 9be78cbbbe more swedish translations iNPUTmice 2014-08-29 12:06:32 +0200
  • 33172246c9 fixed #389 iNPUTmice 2014-08-29 10:24:25 +0200
  • 37e87e7252 Merge pull request #394 from suraia/translation-de Daniel Gultsch 2014-08-29 10:14:00 +0200
  • fc7f57cdd6 Fix some typos in the German translation. Michael Kuhn 2014-08-28 22:54:40 +0200
  • 98dabe9ab4 fix forgotten spelling. Michael 2014-08-28 16:49:52 +0200
  • 85b31b8d8b fixed spelling thanks @betheg iNPUTmice 2014-08-28 11:01:24 +0200
  • 12cbd07693 formating in strings file iNPUTmice 2014-08-28 10:53:44 +0200
  • d8eeab0879 Merge branch 'development' of https://github.com/beriain/Conversations into development iNPUTmice 2014-08-28 10:48:25 +0200
  • 9c8b6b16d5 Update strings.xml Aitor Beriain 2014-08-27 14:48:31 +0200
  • 431d4ed44b translated missing string in settings iNPUTmice 2014-08-27 09:43:53 +0200
  • 16eb8c3952 added swedish translations by Anders Sandblad @andersruneson iNPUTmice 2014-08-27 09:36:47 +0200
  • d617f099a1 added missing string to german translation iNPUTmice 2014-08-26 15:35:48 +0200
  • df394937b7 Merge pull request #385 from rostovtsev/development Daniel Gultsch 2014-08-26 15:34:01 +0200
  • b933a34a59 Updated to 0.6.1 Ilia 2014-08-26 17:26:03 +0400
  • 03e779bc18 Merge pull request #384 from wapolinar/typos Daniel Gultsch 2014-08-26 15:08:46 +0200
  • 28d5ff1189 Typos in readme. Wolfgang Apolinarski 2014-08-26 14:50:03 +0200
  • 902f6c57b1 removed deprecated strings from translations iNPUTmice 2014-08-26 11:20:10 +0200
  • 3ed29e5a8b Merge pull request #376 from wapolinar/development Daniel Gultsch 2014-08-25 20:25:29 +0200
  • a9e962bf93 Merge pull request #377 from kruks23/translation2 Daniel Gultsch 2014-08-25 20:25:15 +0200
  • 5e7450adfa Update Spanish Translations kruks23 2014-08-25 19:49:35 +0200
  • 450b911cb2 fixing duplicate private muc messages iNPUTmice 2014-08-25 19:20:53 +0200
  • 03a387242c Update strings.xml wapolinar 2014-08-25 16:51:20 +0200
  • 07b422d4c8 fixed message hint iNPUTmice 2014-08-25 15:43:50 +0200
  • 4e791c8a01 fixed faulty db creation on first install iNPUTmice 2014-08-24 20:53:13 +0200
  • dce001369d Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-08-24 17:18:10 +0200
  • 74f8e655a2 Merge pull request #375 from kriztan/patch-2 Daniel Gultsch 2014-08-24 17:17:22 +0200
  • eae0a0aa2c Update strings.xml kriztan 2014-08-24 17:14:47 +0200
  • a30bc8a3e2 use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint Daniel Gultsch 2014-08-24 11:21:02 +0200
  • e0b759340d jump right into edit account if now accounts are configured Daniel Gultsch 2014-08-23 21:31:27 +0200
  • d504daec16 changed workflow on inital avatar publication Daniel Gultsch 2014-08-23 20:00:05 +0200
  • f7437ecc36 experimental muc message deduplication Daniel Gultsch 2014-08-23 15:57:39 +0200
  • ee9872277d removed server compat value in favor of a (small xep list) Daniel Gultsch 2014-08-23 15:56:30 +0200
  • 26d6835927 Merge pull request #373 from kruks23/translation1 Daniel Gultsch 2014-08-23 09:52:04 +0200
  • 9b0bf9b5bc fixed another npe iNPUTmice 2014-08-22 13:22:34 +0200
  • c40c8ee910 tiny redesign for private muc messages iNPUTmice 2014-08-22 13:22:07 +0200
  • 9776618164 Update Spanish Translations kruks23 2014-08-21 17:50:07 +0200
  • 4875b52f09 make avatars persisent / available even without internet iNPUTmice 2014-08-21 12:32:50 +0200
  • 301477c764 save newly taken photos in DCIM dir iNPUTmice 2014-08-21 09:19:18 +0200
  • 7808e5b77f added roster versioning to calculation of server compat iNPUTmice 2014-08-21 07:47:40 +0200
  • 419c5e0657 added PEP to readme iNPUTmice 2014-08-21 07:47:09 +0200
  • 7f5456e41b check if service is bound before adding conferences or contacts iNPUTmice 2014-08-21 07:46:55 +0200
  • 9f4043c679 avoid race condition for otr key in jingle iNPUTmice 2014-08-21 07:39:14 +0200
  • bd467b6b9d deregister listener in editaccount iNPUTmice 2014-08-21 07:38:44 +0200
  • a269164458 added missing string resource again iNPUTmice 2014-08-20 11:40:01 +0200
  • 06da080371 revised manage account activity. removed contexual action mode iNPUTmice 2014-08-20 11:32:49 +0200
  • 6345217328 fixed lint error iNPUTmice 2014-08-19 15:27:26 +0200
  • 3b79cc2f23 better error display and additional infos (stats) for the edit account activity iNPUTmice 2014-08-19 15:06:50 +0200
  • d74692e0a5 Merge pull request #365 from beriain/development Daniel Gultsch 2014-08-19 15:06:52 +0200
  • 3ba8dca8b9 Merge pull request #363 from kriztan/patch-1 Daniel Gultsch 2014-08-19 15:06:43 +0200
  • 9963dc63af Update strings.xml Aitor Beriain 2014-08-18 15:00:43 +0200
  • 8c04649d6d Update strings.xml kriztan 2014-08-17 15:00:47 +0200
  • 38f36aa263 more error handling for avatar publication iNPUTmice 2014-08-16 17:31:53 +0200
  • 5aa8afdc1c some improvements for the edit account activity iNPUTmice 2014-08-16 09:44:37 +0200
  • 32c3dd4f4a moved add/edit account from dialog into seperate activity iNPUTmice 2014-08-15 17:31:24 +0200
  • f7c747ef4b better handling of null streams iNPUTmice 2014-08-15 13:34:55 +0200
  • 9c18d57e07 refactored Conversations Adapter into seperate class iNPUTmice 2014-08-15 13:18:15 +0200
  • 0b8af155c1 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-08-15 13:11:47 +0200
  • 2ab14a6ff2 fixed #356 iNPUTmice 2014-08-15 13:11:33 +0200
  • c9db2f8210 Merge pull request #355 from kriztan/patch-2 Daniel Gultsch 2014-08-15 10:19:22 +0200
  • 4f29869607 Update strings.xml kriztan 2014-08-15 09:14:40 +0200
  • caaea6e830 Update strings.xml kriztan 2014-08-15 09:05:30 +0200
  • 8358a513f0 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-08-14 22:10:03 +0200
  • c6b7e3a34e Merge pull request #354 from GreenLunar/development Daniel Gultsch 2014-08-14 22:10:29 +0200
  • 48c780d15a fixed muc pm avatar iNPUTmice 2014-08-14 22:09:03 +0200
  • 7eabefe48b Add Hebrew translation. GreenLunar 2014-08-14 21:04:20 +0300
  • e2a17b4380 Add Hebrew translation. GreenLunar 2014-08-14 21:00:49 +0300
  • 9c18340775 Merge pull request #349 from kruks23/development Daniel Gultsch 2014-08-14 13:50:59 +0200
  • e73a6525c7 fixed bug in caps hash generation. thanks Asterix of the Gajim project iNPUTmice 2014-08-14 13:41:20 +0200
  • 510d8a2ae3 another rare npe fixed iNPUTmice 2014-08-14 09:59:41 +0200
  • b2cc17c362 trying to fix rotation problems iNPUTmice 2014-08-13 13:44:21 +0200
  • 457e7be5e2 fixed #348 iNPUTmice 2014-08-13 11:22:32 +0200
  • a4faa158c0 only notify ui on significant muc changes iNPUTmice 2014-08-13 11:21:33 +0200
  • 07e6873025 try to make openpgp a little more reliable iNPUTmice 2014-08-13 11:21:07 +0200
  • 5477ff1aea fixed weird snackbar click issues iNPUTmice 2014-08-12 23:23:25 +0200
  • 721b308f28 fixed long press to bring back default in publish avatar activity iNPUTmice 2014-08-12 21:03:45 +0200
  • 5e8b05c31b Update Spanish Translations + publish_avatar button and menu conflict kruks23 2014-08-12 18:31:14 +0200
  • 1d0eeef047 Use application context Dominik Schürmann 2014-08-12 15:03:00 +0200
  • 9e1f732b23 More fixes for OpenPgpServiceConnection Dominik Schürmann 2014-08-12 14:38:28 +0200
  • cbfeb90cec Refactor OpenPgpServiceConnection with better callback Dominik Schürmann 2014-08-12 13:46:34 +0200
  • 6952e630c4 show user name as well in confernce details if real name was shown iNPUTmice 2014-08-12 11:36:47 +0200