| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 24 | -178/+501 |
| |\ | | | | | ECC support | ||||
| | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 22 | -153/+494 |
| | | | |||||
| | * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 2 | -0/+6 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | Fix RuntimeException in KeyListActivity on tablets | Dominik Schürmann | 2014-08-28 | 6 | -53/+47 |
| | | | |||||
| * | | v2.8 | Dominik Schürmann | 2014-08-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 8 | -23/+25 |
| |\ \ | |||||
| | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 8 | -24/+25 |
| | | | | |||||
| * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 7 | -8/+20 |
| |/ / | |||||
| * | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 3 | -9/+34 |
| | | | | | | | | | subkeys, fix #696 | ||||
| * | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 5 | -18/+9 |
| | | | |||||
| * | | API: Fix re-seletion of keys on default account | Dominik Schürmann | 2014-08-23 | 2 | -9/+16 |
| | | | |||||
| * | | Pull from transifex | Dominik Schürmann | 2014-08-22 | 19 | -13/+100 |
| | | | |||||
| * | | v2.8 beta4 | Dominik Schürmann | 2014-08-22 | 1 | -2/+2 |
| | | | |||||
| * | | 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 |
| | | | | | | | | | | | | | | | This reverts commit 0c1e65bc8bbfed59d299e2f0ca7a6a30eef22664. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | ||||
| * | | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 |
| |/ | |||||
| * | 2.8 beta3 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | | |||||
| * | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 |
| | | |||||
| * | 2.8 beta2 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | Add sync properties | Dominik Schürmann | 2014-08-21 | 2 | -2/+7 |
| | | |||||
| * | Change account type | Dominik Schürmann | 2014-08-21 | 6 | -9/+12 |
| | | |||||
| * | XML cleanup | Dominik Schürmann | 2014-08-21 | 7 | -79/+11 |
| | | |||||
| * | v2.8 beta1 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-21 | 6 | -42/+22 |
| | | |||||
| * | 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 | 5 | -41/+70 |
| |\ | |||||
| | * | 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 | 8 | -51/+133 |
| | |\ | |||||
| | * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 3 | -2/+8 |
| | | | | |||||
| | * | | Disable key import in sync adapter | Dominik Schürmann | 2014-08-20 | 1 | -38/+39 |
| | | | | |||||
| | * | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 4 | -40/+104 |
| | | | |||||
| * | | 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 | 2 | -3/+3 |
| | |\ | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |