| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix crash in PgpKeyHelper | Dominik Schürmann | 2014-08-28 | 1 | -1/+1 |
| * | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 77 | -1309/+3041 |
| |\ | |||||
| | * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 22 | -174/+459 |
| | |\ | |||||
| | | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 20 | -149/+454 |
| | | * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+4 |
| | | * | Fixing build with Spongy Castle 1.51 | Dominik Schürmann | 2014-08-21 | 2 | -30/+5 |
| | * | | Fix NullPointerException in ImportKeysActivity | Dominik Schürmann | 2014-08-28 | 1 | -1/+3 |
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 2 | -10/+10 |
| | |\ \ | |||||
| | | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 2 | -11/+10 |
| | * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 2 | -3/+14 |
| | |/ / | |||||
| | * | | Abort import of pubkeys where secret keys exist but new pubkey has more subke... | Dominik Schürmann | 2014-08-27 | 2 | -9/+33 |
| | * | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 1 | -6/+4 |
| | * | | API: Fix re-seletion of keys on default account | Dominik Schürmann | 2014-08-23 | 2 | -9/+16 |
| | * | | Fix contact sync | Dominik Schürmann | 2014-08-22 | 1 | -5/+5 |
| | * | | Revert "No need for setSyncAutomatically, this is only for network tickles" | Dominik Schürmann | 2014-08-22 | 1 | -0/+1 |
| | * | | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 |
| | |/ | |||||
| | * | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 |
| | * | Fix nullpointer when revoking keys | Dominik Schürmann | 2014-08-21 | 1 | -1/+2 |
| | * | Add account only on jelly bean and above | Dominik Schürmann | 2014-08-21 | 2 | -8/+15 |
| | * | No need for setSyncAutomatically, this is only for network tickles | Dominik Schürmann | 2014-08-21 | 1 | -3/+5 |
| | * | Change account type | Dominik Schürmann | 2014-08-21 | 4 | -7/+10 |
| | * | cleanup | Dominik Schürmann | 2014-08-21 | 1 | -71/+0 |
| | * | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 2 | -16/+13 |
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 3 | -40/+68 |
| | |\ | |||||
| | | * | Comment extra in requestSync | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | | * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 2 | -0/+21 |
| | | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 7 | -50/+130 |
| | | |\ | |||||
| | | * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 2 | -2/+7 |
| | | * | | Disable key import in sync adapter | Dominik Schürmann | 2014-08-20 | 1 | -38/+39 |
| | * | | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 31 | -2/+31 |
| | | |/ | |/| | |||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 4 | -13/+8 |
| | |\| | |||||
| | | * | Upload key working | Dominik Schürmann | 2014-08-20 | 4 | -13/+8 |
| | * | | small change to make android studio recognize a honeycomb-only block | Vincent Breitmoser | 2014-08-20 | 1 | -2/+4 |
| | * | | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 3 | -40/+103 |
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 7 | -33/+49 |
| | |\| | |||||
| | | * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -0/+3 |
| | | * | Fix key sharing | Dominik Schürmann | 2014-08-20 | 1 | -3/+1 |
| | | * | Work on upload key | Dominik Schürmann | 2014-08-20 | 1 | -14/+24 |
| | | * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 2 | -9/+4 |
| | | * | Fix nullpointer in first time activity | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
| | | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | return some more results | Dominik Schürmann | 2014-08-20 | 2 | -6/+14 |
| | * | | | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -0/+4 |
| | * | | | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 2 | -5/+11 |
| | * | | | close actionmode in keylist on loading events (avoid inconsistent state) | Vincent Breitmoser | 2014-08-20 | 1 | -0/+10 |
| | * | | | consolidate: remove debug "breakpoint" | Vincent Breitmoser | 2014-08-20 | 1 | -5/+0 |
| | | |/ | |/| | |||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -9/+7 |
| | |\| | |||||
| | | * | progress dialog design fix | Dominik Schürmann | 2014-08-20 | 2 | -9/+7 |
| | * | | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 3 | -90/+113 |
| | |\ | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |