Commit graph

  • 69836dc51b refactored share with activity iNPUTmice 2014-09-02 15:51:20 +02:00
  • 7510320c33 fixed #406 iNPUTmice 2014-09-02 11:26:56 +02:00
  • d5274ef598 rotate avatars iNPUTmice 2014-09-02 11:19:05 +02:00
  • a815838a2e fixed #406 iNPUTmice 2014-09-02 11:26:56 +02:00
  • 3d7cd4b432 rotate avatars iNPUTmice 2014-09-02 11:19:05 +02:00
  • aff9d49e21 Merge pull request #408 from emdete/unicode_emoticons Daniel Gultsch 2014-09-02 10:39:13 +02:00
  • 1550262007 add all whitespaces in regex M. Dietrich 2014-09-02 01:16:33 +02:00
  • bef7476a8d Merge pull request #380 from emdete/unicode_emoticons Daniel Gultsch 2014-09-01 23:58:00 +02:00
  • 9c6691f893 transform ascii to emoticons (on display only) M. Dietrich 2014-09-01 23:48:42 +02:00
  • ac205dcb95 removed unused string resources. Michael 2014-09-01 19:49:47 +02:00
  • 89cda02fac fixed #403 iNPUTmice 2014-09-01 13:51:49 +02:00
  • 4216f6603a fixed #403 iNPUTmice 2014-09-01 13:51:49 +02:00
  • 7098218972 Merge pull request #402 from emdete/remove_poormans_tostring Daniel Gultsch 2014-09-01 10:58:26 +02:00
  • bedbfad44b optimize string operations a bit M. Dietrich 2014-09-01 10:40:45 +02:00
  • 8b36d28668 Changelog Dominik Schürmann 2014-08-31 23:49:34 +02:00
  • 575b9d2279 Add userIds to OpenPgpSignatureResult Dominik Schürmann 2014-08-31 23:48:21 +02:00
  • eda2470c4d Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib Dominik Schürmann 2014-08-31 23:39:59 +02:00
  • e0be0f648a Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN Dominik Schürmann 2014-08-31 23:39:56 +02:00
  • 544837fe89 updated readme iNPUTmice 2014-08-31 22:37:34 +02:00
  • c58e1cf43b Contact presenceName property Gayaz Yusipov 2014-08-31 23:14:05 +04:00
  • b7dc05d38d deleted unnecessary log iNPUTmice 2014-08-31 21:02:14 +02:00
  • ae5463af44 Merge pull request #401 from jelmer/dutch-updates Daniel Gultsch 2014-08-31 19:50:56 +02:00
  • 9ba1b5603d Update Dutch translations. Jelmer Vernooij 2014-08-31 19:45:54 +02:00
  • 0edcb26300 show merged time and status in message adapter iNPUTmice 2014-08-31 18:55:15 +02:00
  • e36b591e99 improvements for merge conditions iNPUTmice 2014-08-31 18:21:46 +02:00
  • 20dea2e89f add missing blank before nick iNPUTmice 2014-08-31 17:48:00 +02:00
  • da6bdffec4 Merge pull request #400 from xsrc/development Daniel Gultsch 2014-08-31 17:40:29 +02:00
  • 002198083b Smarter nickname highlight insert in confernces Bahtiar `kalkin-` Gadimov 2014-08-31 17:24:52 +02:00
  • eae174f30f some code cleanup iNPUTmice 2014-08-31 16:28:21 +02:00
  • 5bd749c5c2 Merge pull request #391 from betheg/fix_typo Daniel Gultsch 2014-08-31 15:56:41 +02:00
  • 9b2fb1204d Merge pull request #398 from betheg/fix_res Daniel Gultsch 2014-08-31 15:56:13 +02:00
  • 9c5c459b44 require encrypted to be the same for messages to get merged iNPUTmice 2014-08-31 15:54:53 +02:00
  • e637c5be5c experimental message merging iNPUTmice 2014-08-31 14:29:12 +02:00
  • fb3c754ea8 Merge pull request #1 from Flowdalic/flow Dominik Schürmann 2014-08-30 18:56:17 +02:00
  • 049de74996 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 +02:00
  • d15482c22a Add my Real-name to the Copyright statement Florian Schmaus 2014-08-30 15:19:43 +02:00
  • 201394cfc8 Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-30 14:00:53 +02:00
  • 5c59561f9c XEP-0172 Gayaz Yusipov 2014-08-30 14:26:46 +04:00
  • b9ee9359da version bump to 0.7-alpha iNPUTmice 2014-08-30 09:26:01 +02:00
  • e83f66b275 Merge branch 'sm' into development iNPUTmice 2014-08-30 09:24:58 +02:00
  • 271b614380 reset unsend messages to waiting iNPUTmice 2014-08-27 19:25:58 +02:00
  • 1231e22494 properly set stanza count on session resume iNPUTmice 2014-08-27 14:51:00 +02:00
  • e6b879f9e3 basic message acking iNPUTmice 2014-08-26 16:52:42 +02:00
  • 2784605f81 proper namespaces for xep-0352 iNPUTmice 2014-08-29 12:21:29 +02:00
  • 22cc1c400c send inactive or active on every connect and resume iNPUTmice 2014-08-28 22:23:18 +02:00
  • f6b3ab0bd5 added basic csi iNPUTmice 2014-08-26 17:43:44 +02:00
  • 8ca4dfcca0 version bump to 0.6 with changelogs iNPUTmice 2014-08-30 08:51:55 +02:00
  • 79728d4052 brought npe catcher back for kxml parser iNPUTmice 2014-08-30 08:31:05 +02:00
  • e4532cb2dd Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-29 23:30:47 +02:00
  • f6d1338683 fixed link to old resource iNPUTmice 2014-08-29 14:05:10 +02:00
  • 87098bfac2 fixed npe iNPUTmice 2014-08-29 12:14:10 +02:00
  • f6d05ad683 more swedish translations iNPUTmice 2014-08-29 12:06:32 +02:00
  • b983f5c0c2 fixed #389 iNPUTmice 2014-08-29 10:24:25 +02:00
  • 076dc697ee Merge pull request #394 from suraia/translation-de Daniel Gultsch 2014-08-29 10:14:00 +02:00
  • f8ee8fd2df Fix some typos in the German translation. Michael Kuhn 2014-08-28 22:54:40 +02:00
  • ed5806111b fix forgotten spelling. Michael 2014-08-28 16:49:52 +02:00
  • 2d8354635c fixed spelling thanks @betheg iNPUTmice 2014-08-28 11:01:24 +02:00
  • 1aa4b73365 formating in strings file iNPUTmice 2014-08-28 10:53:44 +02:00
  • 1b78dc0b9a Merge branch 'development' of https://github.com/beriain/Conversations into development iNPUTmice 2014-08-28 10:48:25 +02:00
  • f5a8a68220 Update strings.xml Aitor Beriain 2014-08-27 14:48:31 +02:00
  • 85153c58d0 translated missing string in settings iNPUTmice 2014-08-27 09:43:53 +02:00
  • 6dd8c1e372 added swedish translations by Anders Sandblad @andersruneson iNPUTmice 2014-08-27 09:36:47 +02:00
  • 861187b8ad added missing string to german translation iNPUTmice 2014-08-26 15:35:48 +02:00
  • e077a25697 Merge pull request #385 from rostovtsev/development Daniel Gultsch 2014-08-26 15:34:01 +02:00
  • b20a035681 Updated to 0.6.1 Ilia 2014-08-26 17:26:03 +04:00
  • 896fd75db7 Merge pull request #384 from wapolinar/typos Daniel Gultsch 2014-08-26 15:08:46 +02:00
  • 4dbb1edf0b Typos in readme. Wolfgang Apolinarski 2014-08-26 14:50:03 +02:00
  • 19a276bd75 removed deprecated strings from translations iNPUTmice 2014-08-26 11:20:10 +02:00
  • 7cb716a4c8 Merge pull request #376 from wapolinar/development Daniel Gultsch 2014-08-25 20:25:29 +02:00
  • 5c550b12d1 Merge pull request #377 from kruks23/translation2 Daniel Gultsch 2014-08-25 20:25:15 +02:00
  • 081be98379 Update Spanish Translations kruks23 2014-08-25 19:49:35 +02:00
  • ff0d6646e0 fixing duplicate private muc messages iNPUTmice 2014-08-25 19:20:53 +02:00
  • 655c8351eb Update strings.xml wapolinar 2014-08-25 16:51:20 +02:00
  • 8958df78e9 fixed message hint iNPUTmice 2014-08-25 15:43:50 +02:00
  • 5d496827a7 fixed faulty db creation on first install iNPUTmice 2014-08-24 20:53:13 +02:00
  • 5730395a11 Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-08-24 17:18:10 +02:00
  • 863e04a093 Merge pull request #375 from kriztan/patch-2 Daniel Gultsch 2014-08-24 17:17:22 +02:00
  • 08ef0ff0c5 Update strings.xml kriztan 2014-08-24 17:14:47 +02:00
  • 8f68a5bc1b 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 +02:00
  • e211c71062 jump right into edit account if now accounts are configured Daniel Gultsch 2014-08-23 21:31:27 +02:00
  • b61fbe8e88 changed workflow on inital avatar publication Daniel Gultsch 2014-08-23 20:00:05 +02:00
  • 79aa34bd87 experimental muc message deduplication Daniel Gultsch 2014-08-23 15:57:39 +02:00
  • 4e8425b54e removed server compat value in favor of a (small xep list) Daniel Gultsch 2014-08-23 15:56:30 +02:00
  • b0ae55a1e3 Merge pull request #373 from kruks23/translation1 Daniel Gultsch 2014-08-23 09:52:04 +02:00
  • 7e7837fbfe fixed another npe iNPUTmice 2014-08-22 13:22:34 +02:00
  • 490b4c2368 tiny redesign for private muc messages iNPUTmice 2014-08-22 13:22:07 +02:00
  • 68d96299b7 Update Spanish Translations kruks23 2014-08-21 17:50:07 +02:00
  • 247081d768 make avatars persisent / available even without internet iNPUTmice 2014-08-21 12:32:50 +02:00
  • 437ff901a1 save newly taken photos in DCIM dir iNPUTmice 2014-08-21 09:19:18 +02:00
  • c2333bf182 added roster versioning to calculation of server compat iNPUTmice 2014-08-21 07:47:40 +02:00
  • b5c5aa7e45 added PEP to readme iNPUTmice 2014-08-21 07:47:09 +02:00
  • e2c5b6f453 check if service is bound before adding conferences or contacts iNPUTmice 2014-08-21 07:46:55 +02:00
  • 5db06344b0 avoid race condition for otr key in jingle iNPUTmice 2014-08-21 07:39:14 +02:00
  • 2dc716650c deregister listener in editaccount iNPUTmice 2014-08-21 07:38:44 +02:00
  • d909dea48b added missing string resource again iNPUTmice 2014-08-20 11:40:01 +02:00
  • 15ced062d0 revised manage account activity. removed contexual action mode iNPUTmice 2014-08-20 11:32:49 +02:00
  • f3c2285b37 fixed lint error iNPUTmice 2014-08-19 15:27:26 +02:00
  • 7ab8085682 better error display and additional infos (stats) for the edit account activity iNPUTmice 2014-08-19 15:06:50 +02:00
  • e09b7e4667 Merge pull request #365 from beriain/development Daniel Gultsch 2014-08-19 15:06:52 +02:00
  • dc3f02d588 Merge pull request #363 from kriztan/patch-1 Daniel Gultsch 2014-08-19 15:06:43 +02:00