moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2025-02-23 06:02:00 -05:00
Code Issues Releases Wiki Activity

Commit Graph

  • 12e2f0bdd7 added missing return statement. fixed api bug iNPUTmice 2014-11-04 11:04:05 +01:00
  • 17070d972e Merge pull request #620 from emdete/p0 Daniel Gultsch 2014-11-04 10:50:19 +01:00
  • fb24bf98c9 be more OO M. Dietrich 2014-11-04 09:35:36 +01:00
  • 32396b3bde support pre JELLY_BEAN ndef M. Dietrich 2014-11-04 09:30:03 +01:00
  • 7a9327d960 fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete iNPUTmice 2014-11-03 23:47:49 +01:00
  • d458919c8f unfinishd qr code implemenation. thanks to @emdete iNPUTmice 2014-11-03 22:47:07 +01:00
  • 08cb23a886 fixed merge error iNPUTmice 2014-11-03 21:22:26 +01:00
  • 7d7be8efd8 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc iNPUTmice 2014-11-03 21:07:24 +01:00
  • a054a3fbb4 use different filter for nfc intents iNPUTmice 2014-11-03 21:04:22 +01:00
  • 28a186cd6c basic beam code / untested iNPUTmice 2014-11-03 20:00:20 +01:00
  • 4614ff343e create file explicitly before downloading image iNPUTmice 2014-11-03 20:55:31 +01:00
  • 962008fec8 Merge pull request #614 from SamWhited/spacefixes Daniel Gultsch 2014-11-03 20:30:52 +01:00
  • c48407f3b4 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-03 20:28:58 +01:00
  • 696dd07a41 basic beam code / untested iNPUTmice 2014-11-03 20:00:20 +01:00
  • ec9c264cf7 more error handling for http connection iNPUTmice 2014-11-03 19:59:11 +01:00
  • 21069003b0 disabled proguard. fixed gradle libs iNPUTmice 2014-11-03 19:56:38 +01:00
  • e496a5409b Merge pull request #615 from SamWhited/issue611 Daniel Gultsch 2014-11-03 14:30:15 +01:00
  • 39ae34d3e6 Wrap "last seen" time. Sam Whited 2014-11-03 08:28:20 -05:00
  • 515f2f379f Removed the last \t from the README... Sam Whited 2014-11-03 08:08:51 -05:00
  • 61466f352f Another tab fix. Sam Whited 2014-11-03 08:07:59 -05:00
  • f3401ab64f Fix some space/tab issues in README Sam Whited 2014-11-03 08:06:32 -05:00
  • b54b1ca3b7 Merge pull request #605 from emdete/render_gradle_path Daniel Gultsch 2014-11-03 13:30:10 +01:00
  • 3e05ef77b1 version bump to 0.8.1 iNPUTmice 2014-11-03 11:20:51 +01:00
  • 49920649db always use exif helper iNPUTmice 2014-11-03 11:20:32 +01:00
  • 27f42dfb63 more error handling in xmppconnection iNPUTmice 2014-11-03 10:03:45 +01:00
  • c7d59f1985 adjust path in render script M. Dietrich 2014-11-01 22:27:11 +01:00
  • 1ea2e7dc3b fixed arrayoutofbounds + spelling iNPUTmice 2014-11-01 14:33:34 +01:00
  • a0f694ea44 Merge pull request #600 from SamWhited/gradle Daniel Gultsch 2014-11-01 13:51:05 +01:00
  • 46f147a82c Merge branch 'gradle' into development Sam Whited 2014-10-30 15:20:20 -04:00
  • 142384e580 version bump and changelog 0.8 iNPUTmice 2014-10-30 11:55:25 +01:00
  • f2c1a80059 Merge branch 'development' iNPUTmice 2014-10-30 11:20:35 +01:00
  • 7b4f3637db only end otr session if there is more than one contact presence. reset otherwise iNPUTmice 2014-10-30 10:59:41 +01:00
  • e4567e7a62 cleanup for clear conversation history. small otr fixes iNPUTmice 2014-10-30 00:31:44 +01:00
  • 1b62d94093 replace the exif interface with a small static class from 3d gallery iNPUTmice 2014-10-29 18:12:32 +01:00
  • 03593ba56f proper error state for images iNPUTmice 2014-10-29 11:31:03 +01:00
  • 64209829f7 fixed 'share image' context menu iNPUTmice 2014-10-29 09:57:34 +01:00
  • bb26a84269 fixed intent managment iNPUTmice 2014-10-29 09:57:03 +01:00
  • a11e6dda8f Merge pull request #593 from weiss/improve-german-translations Daniel Gultsch 2014-10-29 09:50:36 +01:00
  • 241c4402c0 Improve some of the German translations Holger Weiß 2014-10-28 20:44:36 +01:00
  • 962e8183f6 end otr session if plain text message from another instance is being received iNPUTmice 2014-10-28 18:02:12 +01:00
  • a362bd1021 Tweak README some more Sam Whited 2014-10-28 12:31:28 -04:00
  • fdc10c794f Fix typo in subtree merge directions Sam Whited 2014-10-28 12:26:41 -04:00
  • f7f4c79419 Add subtree merge directions to README Sam Whited 2014-10-28 12:24:25 -04:00
  • e3f4742ed8 Subtree merged in openpgp api lib Sam Whited 2014-10-28 12:16:35 -04:00
  • f256a466d8 improvements on findConversation iNPUTmice 2014-10-28 17:15:35 +01:00
  • 161623eca2 always show verify fingerprint if there is an active otr session iNPUTmice 2014-10-28 17:15:13 +01:00
  • 4a1bae3a69 Subtree merged in minidns Sam Whited 2014-10-28 12:14:21 -04:00
  • ccba01ef19 Remove minidns dir Sam Whited 2014-10-28 12:13:53 -04:00
  • 41d2e72be7 Subtree merged in MemorizingTrustManager Sam Whited 2014-10-28 12:11:51 -04:00
  • 89c294af11 Don't use submodules Sam Whited 2014-10-28 12:07:04 -04:00
  • 7dcce220cb reworked dns retry iNPUTmice 2014-10-27 21:48:25 +01:00
  • 915def24f9 removed unnecessary logging from avatar service iNPUTmice 2014-10-27 21:48:09 +01:00
  • 698572d218 proper cleanup after pgp image decryption iNPUTmice 2014-10-27 21:47:41 +01:00
  • f45a841caf fixed url parsing iNPUTmice 2014-10-27 21:47:17 +01:00
  • da822ebae8 check for links in pgp encrypted messages as well iNPUTmice 2014-10-27 11:00:03 +01:00
  • b7f596363b Merge pull request #590 from weiss/update-german-translations Daniel Gultsch 2014-10-27 10:00:03 +01:00
  • 08fc3c7f04 Update German translations Holger Weiß 2014-10-26 23:49:25 +01:00
  • b045dea549 set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now iNPUTmice 2014-10-26 20:18:57 +01:00
  • d86b7f3192 Merge pull request #588 from betheg/remove_unused_cast Daniel Gultsch 2014-10-26 20:17:50 +01:00
  • cb21eac501 Merge pull request #587 from betheg/fix_possible_fallthrough Daniel Gultsch 2014-10-26 20:14:09 +01:00
  • 020dc863b1 remove some unused cast Michael 2014-10-26 18:54:10 +01:00
  • 8dae4b1eb9 fix possible fallthrough. Michael 2014-10-26 18:30:58 +01:00
  • b888967b35 Set the root project name Sam Whited 2014-10-26 10:58:50 -04:00
  • 284ad1b053 Merge pull request #586 from SamWhited/issue585 Daniel Gultsch 2014-10-26 15:48:18 +01:00
  • a5e73850b8 Use consistent numbering Sam Whited 2014-10-26 10:37:21 -04:00
  • ef25720f0f Include build number in output of release builds Sam Whited 2014-10-26 10:22:37 -04:00
  • 4024136b1c Use full URI for android application Gradle plugin Sam Whited 2014-10-26 10:14:38 -04:00
  • b82a0e6528 Remove useless include from Gradle settings Sam Whited 2014-10-26 10:13:16 -04:00
  • a6d0042e5c Move submodules back to libs/ Sam Whited 2014-10-26 09:35:11 -04:00
  • 90898ec3d4 Add some logic for signing releases Sam Whited 2014-10-26 09:11:28 -04:00
  • c83e49d1b8 Update otr4j to 0.21 Sam Whited 2014-10-26 09:05:12 -04:00
  • 7f484513be Pull otr4j form Maven repo Sam Whited 2014-10-26 08:54:41 -04:00
  • 8171633eb9 don't merge downloadable messages iNPUTmice 2014-10-24 23:18:19 +02:00
  • 8fb8985412 added message option to download images iNPUTmice 2014-10-24 19:30:03 +02:00
  • 1ea8feaf24 Merge pull request #582 from kruks23/translation7 Daniel Gultsch 2014-10-24 18:55:23 +02:00
  • 192e9d3d99 Update Spanish Translations kruks23 2014-10-24 18:52:38 +02:00
  • e1f11a5735 also show some text in new image notification iNPUTmice 2014-10-24 18:27:53 +02:00
  • 864f3610b3 picture notification and some drive by bug fixes iNPUTmice 2014-10-24 14:34:46 +02:00
  • 1dae59141d Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-10-24 13:29:39 +02:00
  • cbc3d9bd6f notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages iNPUTmice 2014-10-24 13:29:18 +02:00
  • 581e96349c Merge pull request #581 from kruks23/translation7 Daniel Gultsch 2014-10-23 21:35:41 +02:00
  • d73a77643d context menu for messages. allow to resend single messages iNPUTmice 2014-10-23 21:27:41 +02:00
  • 80c512f197 Update Spanish Translations kruks23 2014-10-23 20:36:17 +02:00
  • 5e3b713286 Add non-project files back Sam Whited 2014-10-22 18:26:47 -04:00
  • 5f4b6e39bc Use proguard on release builds Sam Whited 2014-10-22 18:22:49 -04:00
  • 1f49e99c46 Suppress lint errors and remove bcprov Sam Whited 2014-10-22 18:17:49 -04:00
  • bf0c447fec Add proguard rules Sam Whited 2014-10-22 15:49:48 -04:00
  • 281ce3105f Make conversations the root project Sam Whited 2014-10-22 15:44:55 -04:00
  • 07b47172a0 Add build deps and move build props to build file Sam Whited 2014-10-22 15:39:53 -04:00
  • de3739970b Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-10-22 19:05:28 +02:00
  • d04afe453a ability to download pgp encrypted files over http as well iNPUTmice 2014-10-22 19:05:15 +02:00
  • 038f7afd88 Add gradle directory Sam Whited 2014-10-22 12:42:28 -04:00
  • 64bdd7e731 Use Gradle build system Sam Whited 2014-10-22 12:38:44 -04:00
  • f6cf5e9c2f Merge pull request #577 from beriain/development Daniel Gultsch 2014-10-22 17:34:20 +02:00
  • c067bf96b0 small bug fixes for the conversation activity iNPUTmice 2014-10-22 17:32:59 +02:00
  • 451bc8e4eb Update strings.xml Aitor Beriain 2014-10-22 16:04:21 +02:00
  • 62b0fc3fda made httpconnection accept aes encrypted files iNPUTmice 2014-10-22 13:06:46 +02:00
  • 45bdadd915 better aproach on thread saftey iNPUTmice 2014-10-22 00:25:28 +02:00
  • 9f9c3d3c2f changed version to 0.8 alpha iNPUTmice 2014-10-22 00:00:19 +02:00
  • df2257aed6 added hostname verifier to httpconnection iNPUTmice 2014-10-22 00:00:01 +02:00