thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 10 Pull requests 1 Wiki Activity Actions

Commit graph

  • 17fcd3d4a6 brought ad hoc conferences back. fixed #688 fixed #367 iNPUTmice 2014-11-20 18:20:42 +01:00
  • f832fe1c88 Merge pull request #696 from SamWhited/development Daniel Gultsch 2014-11-19 21:20:15 +01:00
  • 2cc897c1d4 Remove broken / unused imports Sam Whited 2014-11-19 14:57:23 -05:00
  • 5ca14bf457 sent read marker to full jid iNPUTmice 2014-11-19 17:40:42 +01:00
  • 4c1135c222 some saftey checks before registering listeners in XmppActivity iNPUTmice 2014-11-19 17:31:28 +01:00
  • 9d049e10ad Merge pull request #691 from kruks23/development Daniel Gultsch 2014-11-19 17:22:57 +01:00
  • a92a626d2d Merge pull request #692 from kriztan/patch-3 Daniel Gultsch 2014-11-19 17:22:50 +01:00
  • 3f63a921aa Merge pull request #694 from beriain/development Daniel Gultsch 2014-11-19 17:22:35 +01:00
  • 553583fd2c Update basque translation Aitor Beriain 2014-11-19 16:12:31 +01:00
  • ecbd2b9997 Update german translations kriztan 2014-11-19 08:51:23 +01:00
  • a0b5e3509b Update spanish translations kruks23 2014-11-19 00:16:45 +01:00
  • c6074a6bc1 Update spanish translations kruks23 2014-11-18 23:53:37 +01:00
  • c8e19f91bf added faq for srv records iNPUTmice 2014-11-18 23:26:22 +01:00
  • 026aceec37 put error notification into notification service iNPUTmice 2014-11-18 15:26:28 +01:00
  • 6db71812fb simplified message merge condition iNPUTmice 2014-11-18 14:49:49 +01:00
  • ccc689ec67 synchronized message list in conversation fragment iNPUTmice 2014-11-18 14:43:15 +01:00
  • d5a159a2b5 show dynamic tags in contacts activity as well iNPUTmice 2014-11-18 14:24:06 +01:00
  • c18cae7fa2 properly remove conversations context menu iNPUTmice 2014-11-18 13:51:04 +01:00
  • 19a3980b76 disabled broken conversations context menu iNPUTmice 2014-11-18 03:12:51 +01:00
  • f2a75bcc1e better usage of synchronized in some places iNPUTmice 2014-11-18 03:10:59 +01:00
  • f4fa6f91ce 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
  • 050e3950c6 added rendered versions of new icons iNPUTmice 2014-11-18 00:42:19 +01:00
  • 6175bbb8af Merge branch 'qooob-development' into development iNPUTmice 2014-11-18 00:41:47 +01:00
  • b3b8ecc492 Merge branch 'development' of https://github.com/qooob/Conversations into qooob-development iNPUTmice 2014-11-18 00:28:37 +01:00
  • 2874ab94fa context menu for conversations. fixed #630 iNPUTmice 2014-11-18 00:07:27 +01:00
  • a47c1a4d87 Update README.md Ilia Rostovtsev 2014-11-18 00:58:36 +03:00
  • 3afbcdd64f Updated launcher icon: Bigger circles Ilia Rostovtsev 2014-11-18 00:57:01 +03:00
  • cc76ff146a Notification icon: Solid version Ilia Rostovtsev 2014-11-18 00:55:50 +03:00
  • 19e7bebf68 Notification icon: Dashed-solid version Ilia Rostovtsev 2014-11-18 00:55:20 +03:00
  • 536192da20 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
  • a4fe956581 clear avatar cache with new roster push from server iNPUTmice 2014-11-17 21:28:16 +01:00
  • a1a103c711 avoided some null pointers iNPUTmice 2014-11-17 20:45:00 +01:00
  • b75564ecd1 context menu for muc participants + refactor trueCounterpart to use Jid class iNPUTmice 2014-11-17 20:02:46 +01:00
  • 3e1123d05c synchronized around cache clear in avatar service iNPUTmice 2014-11-17 20:01:56 +01:00
  • a60195589c Merge pull request #681 from SamWhited/searchlocalefix Daniel Gultsch 2014-11-17 18:27:21 +01:00
  • 94bf19cc8e Use `Locale.US' for string comparisons in search Sam Whited 2014-11-17 11:53:19 -05:00
  • 78518f9051 Merge pull request #680 from ferdev1/patch-2 Daniel Gultsch 2014-11-17 18:14:50 +01:00
  • dd9c42c193 trim search before searching iNPUTmice 2014-11-17 17:31:26 +01:00
  • 53461a1c23 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-17 17:24:56 +01:00
  • d8f7b2510f split search keywords by whitespaces and imply AND operatior iNPUTmice 2014-11-17 17:24:33 +01:00
  • 7ee6551670 slightly modified logo / launcher icon iNPUTmice 2014-11-17 17:23:58 +01:00
  • 28105ad6fa Update strings.xml ferdev1 2014-11-17 17:13:20 +01:00
  • 5d17205f70 Merge pull request #679 from SamWhited/lintfix Daniel Gultsch 2014-11-17 15:25:58 +01:00
  • 8fa16aa3c8 Fix linter suppression Sam Whited 2014-11-17 09:19:11 -05:00
  • f0eb64e772 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-17 01:54:19 +01:00
  • a11f12a468 highlight muc members by touching their name in muc details. fixed #503 iNPUTmice 2014-11-17 01:54:01 +01:00
  • 927bae9b55 Merge pull request #675 from ferdev1/patch-1 Daniel Gultsch 2014-11-17 00:04:53 +01:00
  • 45fa9a8c4d made tags searchable iNPUTmice 2014-11-16 23:58:30 +01:00
  • f7bfe471d4 fixed regression of xmpp uris not working iNPUTmice 2014-11-16 22:23:42 +01:00
  • b5b52a754a Fix string ferdev1 2014-11-16 18:11:14 +01:00
  • 8b3ff6d764 Merge pull request #673 from SamWhited/development Daniel Gultsch 2014-11-16 17:35:59 +01:00
  • d026a7a13b happy hanukkah iNPUTmice 2014-11-16 17:21:21 +01:00
  • 643d10e02c Fix fetching accounts by JIDs Sam Whited 2014-11-16 10:04:45 -05:00
  • dcc8db3eeb Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-16 12:28:21 +01:00
  • 9fae1bfba5 Merge branch 'master' into development iNPUTmice 2014-11-16 12:27:17 +01:00
  • 6a40d23eaa version bump to 0.8.4 iNPUTmice 2014-11-16 12:25:08 +01:00
  • b30f1c6408 show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
  • af09f0836b show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
  • c28bbbba5e better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
  • f494b6e43f better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
  • 09dbac94f3 Merge pull request #672 from SamWhited/development Daniel Gultsch 2014-11-16 03:13:53 +01:00
  • 8fca67fc3e Don't escape passwords in SASL Sam Whited 2014-11-15 21:09:51 -05:00
  • 9a6800d647 made scan and show qr code more accessible in VerifyOtrActivity iNPUTmice 2014-11-16 02:10:29 +01:00
  • 6743fb1acd Merge branch 'master' into development iNPUTmice 2014-11-16 00:34:44 +01:00
  • ed4225e77d close cursor for database iNPUTmice 2014-11-16 00:34:16 +01:00
  • caf943c1a9 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
  • bc75cdaa41 Merge pull request #669 from SamWhited/scramcaching Daniel Gultsch 2014-11-15 21:02:13 +01:00
  • 2d65c87c4d Merge pull request #670 from kruks23/translation9 Daniel Gultsch 2014-11-15 21:00:05 +01:00
  • d9a1b1cffc small modifications for changing an account status in XmppConnection iNPUTmice 2014-11-15 20:54:28 +01:00
  • 16a4cc1b54 Update Spanish Translations kruks23 2014-11-15 20:48:31 +01:00
  • d41ada23a0 Cache SCRAM-SHA-1 keys for current session Sam Whited 2014-11-15 12:57:36 -05:00
  • 2b7f98ec9d Merge pull request #668 from SamWhited/auth-pinning Daniel Gultsch 2014-11-15 17:44:51 +01:00
  • 41116ee2b7 Set security error status on TLS cert mismatch Sam Whited 2014-11-15 11:40:41 -05:00
  • 3b8165d3e8 Remove extra status wrapper method Sam Whited 2014-11-15 11:31:15 -05:00
  • 08fd021088 Add incompatible server status Sam Whited 2014-11-15 11:29:58 -05:00
  • ed9b1701a6 fixed some disco / carbon related bugs iNPUTmice 2014-11-15 17:24:06 +01:00
  • 40fd3c8747 Add security error status Sam Whited 2014-11-15 11:19:42 -05:00
  • 402c934daa Make account status an enum Sam Whited 2014-11-15 11:09:02 -05:00
  • 2703366fbe Add auth method pinning Sam Whited 2014-11-15 09:42:40 -05:00
  • a6acd388b4 Merge branch 'feature/file_transfer' into development iNPUTmice 2014-11-15 15:52:15 +01:00
  • a0e1b05a16 Merge branch 'feature/foreground_service' into development iNPUTmice 2014-11-15 15:51:27 +01:00
  • b864b5b0ca Merge branch 'feature/otr_verification' into development iNPUTmice 2014-11-15 15:50:35 +01:00
  • bdcd14bf63 added low priority and removed date in foreground noticfication iNPUTmice 2014-11-12 17:33:24 +01:00
  • bdf4ba7cb3 turn on foreground service in expert settings iNPUTmice 2014-11-12 14:41:43 +01:00
  • e7b45d62b1 handled more error cases iNPUTmice 2014-11-15 15:16:40 +01:00
  • d492418fbc better cleanup after unsuccesful transfers iNPUTmice 2014-11-15 14:52:51 +01:00
  • a6edf92bb7 fixed description in notifications and conversation overview iNPUTmice 2014-11-15 14:40:43 +01:00
  • 96220dbfde fixed resending for files as well iNPUTmice 2014-11-15 13:19:04 +01:00
  • cb9ff7c1cf made file transfers cancelable iNPUTmice 2014-11-15 12:37:09 +01:00
  • 4a65beda2e adepted conversationadapter to deal with files iNPUTmice 2014-11-14 17:39:03 +01:00
  • 5e93ee2746 progress for ibb transfers iNPUTmice 2014-11-14 14:04:34 +01:00
  • 4d2a19989f some mime and pgp fixes for file transfer iNPUTmice 2014-11-14 12:31:57 +01:00
  • 957685bcd3 support for pgp files iNPUTmice 2014-11-14 03:27:18 +01:00
  • 1d5d556af2 progress for http images as well. fixed open button for sent files iNPUTmice 2014-11-14 01:29:56 +01:00
  • 0332fb0937 copy non local files to private storage first iNPUTmice 2014-11-14 00:28:39 +01:00
  • ced62443bc bug fixes and various improvements for file transfer iNPUTmice 2014-11-13 22:59:00 +01:00
  • 120209b145 basic arbitrary file transfer iNPUTmice 2014-11-13 21:04:05 +01:00
  • a9365755e4 Merge pull request #665 from SamWhited/issue71 Daniel Gultsch 2014-11-15 15:34:50 +01:00
  • dd35fbeb67 Improve auth error handling and state machine Sam Whited 2014-11-15 08:48:40 -05:00
  • c158287e4d Merge pull request #666 from SamWhited/localefixes Daniel Gultsch 2014-11-15 13:12:29 +01:00