Commit graph

  • 6bb0eb0b98 Merge pull request #696 from SamWhited/development Daniel Gultsch 2014-11-19 21:20:15 +01:00
  • 73d184352e Remove broken / unused imports Sam Whited 2014-11-19 14:57:23 -05:00
  • e9948f6b84 sent read marker to full jid iNPUTmice 2014-11-19 17:40:42 +01:00
  • cbf42ee12c some saftey checks before registering listeners in XmppActivity iNPUTmice 2014-11-19 17:31:28 +01:00
  • 4b9a507633 Merge pull request #691 from kruks23/development Daniel Gultsch 2014-11-19 17:22:57 +01:00
  • 393807ab2d Merge pull request #692 from kriztan/patch-3 Daniel Gultsch 2014-11-19 17:22:50 +01:00
  • c2c3923ad4 Merge pull request #694 from beriain/development Daniel Gultsch 2014-11-19 17:22:35 +01:00
  • 24b5d0eb26 Update basque translation Aitor Beriain 2014-11-19 16:12:31 +01:00
  • 6847594363 Update german translations kriztan 2014-11-19 08:51:23 +01:00
  • 3ccee22c86 Update spanish translations kruks23 2014-11-19 00:16:45 +01:00
  • 8f33f3540a Update spanish translations kruks23 2014-11-18 23:53:37 +01:00
  • ad0edfb839 added faq for srv records iNPUTmice 2014-11-18 23:26:22 +01:00
  • 66087cb360 put error notification into notification service iNPUTmice 2014-11-18 15:26:28 +01:00
  • 1122e084a0 simplified message merge condition iNPUTmice 2014-11-18 14:49:49 +01:00
  • 10bf2b77a8 synchronized message list in conversation fragment iNPUTmice 2014-11-18 14:43:15 +01:00
  • dcebc120ac show dynamic tags in contacts activity as well iNPUTmice 2014-11-18 14:24:06 +01:00
  • ab832bcff7 properly remove conversations context menu iNPUTmice 2014-11-18 13:51:04 +01:00
  • d29c861d03 disabled broken conversations context menu iNPUTmice 2014-11-18 03:12:51 +01:00
  • 018a0c7978 better usage of synchronized in some places iNPUTmice 2014-11-18 03:10:59 +01:00
  • 090e6ecf09 better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary iNPUTmice 2014-11-18 01:48:16 +01:00
  • d2a4855a1e added rendered versions of new icons iNPUTmice 2014-11-18 00:42:19 +01:00
  • 078f0ea103 Merge branch 'qooob-development' into development iNPUTmice 2014-11-18 00:41:47 +01:00
  • ef681c2a96 Merge branch 'development' of https://github.com/qooob/Conversations into qooob-development iNPUTmice 2014-11-18 00:28:37 +01:00
  • 240d2d68c8 context menu for conversations. fixed #630 iNPUTmice 2014-11-18 00:07:27 +01:00
  • a4c884829a Update README.md Ilia Rostovtsev 2014-11-18 00:58:36 +03:00
  • f9e61f154b Updated launcher icon: Bigger circles Ilia Rostovtsev 2014-11-18 00:57:01 +03:00
  • 0bf108a95d Notification icon: Solid version Ilia Rostovtsev 2014-11-18 00:55:50 +03:00
  • 853bddd07f Notification icon: Dashed-solid version Ilia Rostovtsev 2014-11-18 00:55:20 +03:00
  • 123036fdaa bump to version 0.9-alpha to differentiate stack traces. no feature freeze or anything else iNPUTmice 2014-11-17 21:40:48 +01:00
  • 86241a260a clear avatar cache with new roster push from server iNPUTmice 2014-11-17 21:28:16 +01:00
  • abbadcb58b avoided some null pointers iNPUTmice 2014-11-17 20:45:00 +01:00
  • f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class iNPUTmice 2014-11-17 20:02:46 +01:00
  • 283d5058e5 synchronized around cache clear in avatar service iNPUTmice 2014-11-17 20:01:56 +01:00
  • c058594ff5 Merge pull request #681 from SamWhited/searchlocalefix Daniel Gultsch 2014-11-17 18:27:21 +01:00
  • b6d8977237 Use `Locale.US' for string comparisons in search Sam Whited 2014-11-17 11:53:19 -05:00
  • e664a0c936 Merge pull request #680 from ferdev1/patch-2 Daniel Gultsch 2014-11-17 18:14:50 +01:00
  • 8865cc406c trim search before searching iNPUTmice 2014-11-17 17:31:26 +01:00
  • 1a5af45afb Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-17 17:24:56 +01:00
  • 252c7e68d6 split search keywords by whitespaces and imply AND operatior iNPUTmice 2014-11-17 17:24:33 +01:00
  • e30e84c819 slightly modified logo / launcher icon iNPUTmice 2014-11-17 17:23:58 +01:00
  • 6c13b8a9a1 Update strings.xml ferdev1 2014-11-17 17:13:20 +01:00
  • c7b8d3648a Merge pull request #679 from SamWhited/lintfix Daniel Gultsch 2014-11-17 15:25:58 +01:00
  • 55957a77b3 Fix linter suppression Sam Whited 2014-11-17 09:19:11 -05:00
  • ceecc8ffe7 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-17 01:54:19 +01:00
  • 967cd922e1 highlight muc members by touching their name in muc details. fixed #503 iNPUTmice 2014-11-17 01:54:01 +01:00
  • 81b93c763a Merge pull request #675 from ferdev1/patch-1 Daniel Gultsch 2014-11-17 00:04:53 +01:00
  • 2036c58cd7 made tags searchable iNPUTmice 2014-11-16 23:58:30 +01:00
  • 8c4236b01b fixed regression of xmpp uris not working iNPUTmice 2014-11-16 22:23:42 +01:00
  • c147f44cf1 Fix string ferdev1 2014-11-16 18:11:14 +01:00
  • 155b607f4d Merge pull request #673 from SamWhited/development Daniel Gultsch 2014-11-16 17:35:59 +01:00
  • cf00f3fade happy hanukkah iNPUTmice 2014-11-16 17:21:21 +01:00
  • 5765a91db6 Fix fetching accounts by JIDs Sam Whited 2014-11-16 10:04:45 -05:00
  • 84b2ce10b7 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-16 12:28:21 +01:00
  • d43aeb7218 Merge branch 'master' into development iNPUTmice 2014-11-16 12:27:17 +01:00
  • 279534ddb4 version bump to 0.8.4 iNPUTmice 2014-11-16 12:25:08 +01:00
  • ccc3c10066 show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
  • ac8c2b7e62 show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
  • f41f3b120c better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
  • f18f3086af better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
  • 2c65477532 Merge pull request #672 from SamWhited/development Daniel Gultsch 2014-11-16 03:13:53 +01:00
  • cfdda5f8fd Don't escape passwords in SASL Sam Whited 2014-11-15 21:09:51 -05:00
  • 2067b9bd8d made scan and show qr code more accessible in VerifyOtrActivity iNPUTmice 2014-11-16 02:10:29 +01:00
  • 2b21bc13fc Merge branch 'master' into development iNPUTmice 2014-11-16 00:34:44 +01:00
  • ac4eabbd22 close cursor for database iNPUTmice 2014-11-16 00:34:16 +01:00
  • 88c3537b68 parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible iNPUTmice 2014-11-16 00:20:20 +01:00
  • 0fb1772f18 Merge pull request #669 from SamWhited/scramcaching Daniel Gultsch 2014-11-15 21:02:13 +01:00
  • 4a8fa8b498 Merge pull request #670 from kruks23/translation9 Daniel Gultsch 2014-11-15 21:00:05 +01:00
  • 5a634fdf47 small modifications for changing an account status in XmppConnection iNPUTmice 2014-11-15 20:54:28 +01:00
  • 0dc711d710 Update Spanish Translations kruks23 2014-11-15 20:48:31 +01:00
  • a463f82e3b Cache SCRAM-SHA-1 keys for current session Sam Whited 2014-11-15 12:57:36 -05:00
  • 69ab8a2adb Merge pull request #668 from SamWhited/auth-pinning Daniel Gultsch 2014-11-15 17:44:51 +01:00
  • 17cec63c14 Set security error status on TLS cert mismatch Sam Whited 2014-11-15 11:40:41 -05:00
  • d2388a5a7e Remove extra status wrapper method Sam Whited 2014-11-15 11:31:15 -05:00
  • 251f4d6d7f Add incompatible server status Sam Whited 2014-11-15 11:29:58 -05:00
  • 7ba9854c22 fixed some disco / carbon related bugs iNPUTmice 2014-11-15 17:24:06 +01:00
  • c09d450db8 Add security error status Sam Whited 2014-11-15 11:19:42 -05:00
  • d94b07c916 Make account status an enum Sam Whited 2014-11-15 11:09:02 -05:00
  • 847877f9d2 Add auth method pinning Sam Whited 2014-11-15 09:42:40 -05:00
  • 35bf13f5ef Merge branch 'feature/file_transfer' into development iNPUTmice 2014-11-15 15:52:15 +01:00
  • 07b07115d6 Merge branch 'feature/foreground_service' into development iNPUTmice 2014-11-15 15:51:27 +01:00
  • 5b9c690c47 Merge branch 'feature/otr_verification' into development iNPUTmice 2014-11-15 15:50:35 +01:00
  • bdc86bb8e3 added low priority and removed date in foreground noticfication iNPUTmice 2014-11-12 17:33:24 +01:00
  • 3c6b3506e3 turn on foreground service in expert settings iNPUTmice 2014-11-12 14:41:43 +01:00
  • 41f7848f2c handled more error cases iNPUTmice 2014-11-15 15:16:40 +01:00
  • ca2d86cf87 better cleanup after unsuccesful transfers iNPUTmice 2014-11-15 14:52:51 +01:00
  • 47d44448f3 fixed description in notifications and conversation overview iNPUTmice 2014-11-15 14:40:43 +01:00
  • e0f012dba1 fixed resending for files as well iNPUTmice 2014-11-15 13:19:04 +01:00
  • cc4f3702a8 made file transfers cancelable iNPUTmice 2014-11-15 12:37:09 +01:00
  • 4ab558715c adepted conversationadapter to deal with files iNPUTmice 2014-11-14 17:39:03 +01:00
  • af2922adea progress for ibb transfers iNPUTmice 2014-11-14 14:04:34 +01:00
  • e7a70a46e0 some mime and pgp fixes for file transfer iNPUTmice 2014-11-14 12:31:57 +01:00
  • 16847a30c8 support for pgp files iNPUTmice 2014-11-14 03:27:18 +01:00
  • c7acfe85c3 progress for http images as well. fixed open button for sent files iNPUTmice 2014-11-14 01:29:56 +01:00
  • dac12be53e copy non local files to private storage first iNPUTmice 2014-11-14 00:28:39 +01:00
  • 02cbda68a7 bug fixes and various improvements for file transfer iNPUTmice 2014-11-13 22:59:00 +01:00
  • 7a90ca429b basic arbitrary file transfer iNPUTmice 2014-11-13 21:04:05 +01:00
  • 4c504dea7a Merge pull request #665 from SamWhited/issue71 Daniel Gultsch 2014-11-15 15:34:50 +01:00
  • 4b5d6f5b4f Improve auth error handling and state machine Sam Whited 2014-11-15 08:48:40 -05:00
  • e2fb32841b Merge pull request #666 from SamWhited/localefixes Daniel Gultsch 2014-11-15 13:12:29 +01:00
  • 591326f952 Merge pull request #667 from SamWhited/licensesuntranslatable Daniel Gultsch 2014-11-15 13:12:16 +01:00