Commit graph

  • 64209829f7 fixed 'share image' context menu iNPUTmice 2014-10-29 09:57:34 +0100
  • bb26a84269 fixed intent managment iNPUTmice 2014-10-29 09:57:03 +0100
  • a11e6dda8f Merge pull request #593 from weiss/improve-german-translations Daniel Gultsch 2014-10-29 09:50:36 +0100
  • 241c4402c0 Improve some of the German translations Holger Weiß 2014-10-28 20:44:36 +0100
  • 962e8183f6 end otr session if plain text message from another instance is being received iNPUTmice 2014-10-28 18:02:12 +0100
  • a362bd1021 Tweak README some more Sam Whited 2014-10-28 12:31:28 -0400
  • fdc10c794f Fix typo in subtree merge directions Sam Whited 2014-10-28 12:26:41 -0400
  • f7f4c79419 Add subtree merge directions to README Sam Whited 2014-10-28 12:24:25 -0400
  • e3f4742ed8 Subtree merged in openpgp api lib Sam Whited 2014-10-28 12:16:35 -0400
  • f256a466d8 improvements on findConversation iNPUTmice 2014-10-28 17:15:35 +0100
  • 161623eca2 always show verify fingerprint if there is an active otr session iNPUTmice 2014-10-28 17:15:13 +0100
  • 4a1bae3a69 Subtree merged in minidns Sam Whited 2014-10-28 12:14:21 -0400
  • ccba01ef19 Remove minidns dir Sam Whited 2014-10-28 12:13:53 -0400
  • 41d2e72be7 Subtree merged in MemorizingTrustManager Sam Whited 2014-10-28 12:11:51 -0400
  • 89c294af11 Don't use submodules Sam Whited 2014-10-28 12:07:04 -0400
  • 7dcce220cb reworked dns retry iNPUTmice 2014-10-27 21:48:25 +0100
  • 915def24f9 removed unnecessary logging from avatar service iNPUTmice 2014-10-27 21:48:09 +0100
  • 698572d218 proper cleanup after pgp image decryption iNPUTmice 2014-10-27 21:47:41 +0100
  • f45a841caf fixed url parsing iNPUTmice 2014-10-27 21:47:17 +0100
  • da822ebae8 check for links in pgp encrypted messages as well iNPUTmice 2014-10-27 11:00:03 +0100
  • b7f596363b Merge pull request #590 from weiss/update-german-translations Daniel Gultsch 2014-10-27 10:00:03 +0100
  • 08fc3c7f04 Update German translations Holger Weiß 2014-10-26 23:49:25 +0100
  • 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 +0100
  • d86b7f3192 Merge pull request #588 from betheg/remove_unused_cast Daniel Gultsch 2014-10-26 20:17:50 +0100
  • cb21eac501 Merge pull request #587 from betheg/fix_possible_fallthrough Daniel Gultsch 2014-10-26 20:14:09 +0100
  • 020dc863b1 remove some unused cast Michael 2014-10-26 18:54:10 +0100
  • 8dae4b1eb9 fix possible fallthrough. Michael 2014-10-26 18:30:58 +0100
  • b888967b35 Set the root project name Sam Whited 2014-10-26 10:58:50 -0400
  • 284ad1b053 Merge pull request #586 from SamWhited/issue585 Daniel Gultsch 2014-10-26 15:48:18 +0100
  • a5e73850b8 Use consistent numbering Sam Whited 2014-10-26 10:37:21 -0400
  • ef25720f0f Include build number in output of release builds Sam Whited 2014-10-26 10:22:37 -0400
  • 4024136b1c Use full URI for android application Gradle plugin Sam Whited 2014-10-26 10:14:38 -0400
  • b82a0e6528 Remove useless include from Gradle settings Sam Whited 2014-10-26 10:13:16 -0400
  • a6d0042e5c Move submodules back to libs/ Sam Whited 2014-10-26 09:35:11 -0400
  • 90898ec3d4 Add some logic for signing releases Sam Whited 2014-10-26 09:11:28 -0400
  • c83e49d1b8 Update otr4j to 0.21 Sam Whited 2014-10-26 09:05:12 -0400
  • 7f484513be Pull otr4j form Maven repo Sam Whited 2014-10-26 08:54:41 -0400
  • 8171633eb9 don't merge downloadable messages iNPUTmice 2014-10-24 23:18:19 +0200
  • 8fb8985412 added message option to download images iNPUTmice 2014-10-24 19:30:03 +0200
  • 1ea8feaf24 Merge pull request #582 from kruks23/translation7 Daniel Gultsch 2014-10-24 18:55:23 +0200
  • 192e9d3d99 Update Spanish Translations kruks23 2014-10-24 18:52:38 +0200
  • e1f11a5735 also show some text in new image notification iNPUTmice 2014-10-24 18:27:53 +0200
  • 864f3610b3 picture notification and some drive by bug fixes iNPUTmice 2014-10-24 14:34:46 +0200
  • 1dae59141d Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-10-24 13:29:39 +0200
  • 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 +0200
  • 581e96349c Merge pull request #581 from kruks23/translation7 Daniel Gultsch 2014-10-23 21:35:41 +0200
  • d73a77643d context menu for messages. allow to resend single messages iNPUTmice 2014-10-23 21:27:41 +0200
  • 80c512f197 Update Spanish Translations kruks23 2014-10-23 20:36:17 +0200
  • 5e3b713286 Add non-project files back Sam Whited 2014-10-22 18:26:47 -0400
  • 5f4b6e39bc Use proguard on release builds Sam Whited 2014-10-22 18:22:49 -0400
  • 1f49e99c46 Suppress lint errors and remove bcprov Sam Whited 2014-10-22 18:17:49 -0400
  • bf0c447fec Add proguard rules Sam Whited 2014-10-22 15:49:48 -0400
  • 281ce3105f Make conversations the root project Sam Whited 2014-10-22 15:44:55 -0400
  • 07b47172a0 Add build deps and move build props to build file Sam Whited 2014-10-22 15:39:53 -0400
  • de3739970b Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-10-22 19:05:28 +0200
  • d04afe453a ability to download pgp encrypted files over http as well iNPUTmice 2014-10-22 19:05:15 +0200
  • 038f7afd88 Add gradle directory Sam Whited 2014-10-22 12:42:28 -0400
  • 64bdd7e731 Use Gradle build system Sam Whited 2014-10-22 12:38:44 -0400
  • f6cf5e9c2f Merge pull request #577 from beriain/development Daniel Gultsch 2014-10-22 17:34:20 +0200
  • c067bf96b0 small bug fixes for the conversation activity iNPUTmice 2014-10-22 17:32:59 +0200
  • 451bc8e4eb Update strings.xml Aitor Beriain 2014-10-22 16:04:21 +0200
  • 62b0fc3fda made httpconnection accept aes encrypted files iNPUTmice 2014-10-22 13:06:46 +0200
  • 45bdadd915 better aproach on thread saftey iNPUTmice 2014-10-22 00:25:28 +0200
  • 9f9c3d3c2f changed version to 0.8 alpha iNPUTmice 2014-10-22 00:00:19 +0200
  • df2257aed6 added hostname verifier to httpconnection iNPUTmice 2014-10-22 00:00:01 +0200
  • 40c74b432e made iterating over hashmap in notification service thread safe iNPUTmice 2014-10-21 23:59:02 +0200
  • 63704b114c throw exception when no servers are left to try iNPUTmice 2014-10-21 20:13:06 +0200
  • 3821a72644 fixed #564 iNPUTmice 2014-10-21 19:43:34 +0200
  • a56ee63a3e update ui when new avatar was found iNPUTmice 2014-10-21 15:26:17 +0200
  • 0d767c3971 proper avatar caching iNPUTmice 2014-10-21 14:57:16 +0200
  • 21961673cb refactored avatar generation. first step iNPUTmice 2014-10-20 21:08:33 +0200
  • 0bb2c3c4d5 keep reference to previous and next message in message iNPUTmice 2014-10-20 17:01:37 +0200
  • a8a37ec08d Merge pull request #569 from kriztan/patch-1 Daniel Gultsch 2014-10-20 09:24:39 +0200
  • b9288ed050 Merge pull request #570 from SamWhited/typo-fixes Daniel Gultsch 2014-10-20 09:24:20 +0200
  • 843a978ca1 Went a bit wild on the README... Sam Whited 2014-10-19 22:16:41 -0400
  • 268f790b4c A few typo fixes in the README Sam Whited 2014-10-19 19:03:13 -0400
  • 47485fe0c6 Fixed some strange wording in a string Sam Whited 2014-10-19 18:22:06 -0400
  • 0b61fb0129 Merge pull request #554 from SamWhited/tls Daniel Gultsch 2014-10-20 00:03:32 +0200
  • 8263e07336 mtm support for image downloader iNPUTmice 2014-10-19 23:42:53 +0200
  • 44f9022d95 use new 'api' to add messages to a conversation iNPUTmice 2014-10-19 23:15:24 +0200
  • c9238ef5ae force tls for registrations as well iNPUTmice 2014-10-19 23:14:17 +0200
  • a201f9e53f got rid of copyonwrite array list for messages iNPUTmice 2014-10-19 23:13:55 +0200
  • 99ee049115 Make legacy SSL option default to false Sam Whited 2014-10-19 16:11:35 -0400
  • 6c7c3ddf15 Add "Enable legacy SSL" preference Sam Whited 2014-10-19 15:53:03 -0400
  • e8bf75d79b force tls iNPUTmice 2014-10-19 20:48:01 +0200
  • 9372a98c0c Merge branch 'lactide-srv_fix' into development iNPUTmice 2014-10-19 20:19:35 +0200
  • f824193c56 Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix iNPUTmice 2014-10-19 20:17:12 +0200
  • 713cd6ef89 fixed typo in french translation iNPUTmice 2014-10-19 18:15:02 +0200
  • 30648a835d Merge pull request #555 from SamWhited/build-fixes Daniel Gultsch 2014-10-19 18:01:45 +0200
  • 7539261491 Merge pull request #566 from BenoitBouvarel/patch-1 Daniel Gultsch 2014-10-19 18:00:55 +0200
  • 3f280134bb Merge pull request #565 from the-solipsist/patch-2 Daniel Gultsch 2014-10-19 18:00:32 +0200
  • f20c43d1a2 Set default preference ... kriztan 2014-10-19 09:32:49 +0200
  • 113b7d1736 Remove support for legacy SSL Sam Whited 2014-10-18 15:56:59 -0400
  • ac3c96b0db Update README.md the-solipsist 2014-10-18 18:01:19 +0530
  • 09abf7b9f8 Update strings.xml Benoit Bouvarel 2014-10-18 19:20:41 +0700
  • 1d9bd64e1d Update README.md the-solipsist 2014-10-17 23:55:41 +0530
  • 0605390144 do not attempt to download images when not connected iNPUTmice 2014-10-17 13:09:02 +0200
  • 3372e50155 made grace period on a per account basis iNPUTmice 2014-10-17 11:01:38 +0200
  • c725da954c try all srv responses if necessary Frank Zschockelt 2014-10-16 23:31:48 +0200
  • 5e3caf9626 additonal safty net for disabling notifications iNPUTmice 2014-10-16 19:10:37 +0200