| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 1 | -0/+10 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -58/+80 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| | * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -63/+63 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 1 | -58/+58 |
| | | | | |||||
| | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -60/+10 |
| | |\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | | Store expired state within ImportKeysListEntry | mar-v-in | 2014-06-04 | 1 | -0/+11 |
| | | | | |||||
| | * | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 1 | -0/+11 |
| | | | | |||||
| * | | | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -24/+0 |
| | | | | | | | | | ImportKeysListEntry | ||||
| * | | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 1 | -2/+1 |
| | | | |||||
| * | | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -37/+12 |
| |/ | |||||
| * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 1 | -0/+9 |
| | | |||||
| * | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 1 | -8/+8 |
| | | |||||
| * | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 1 | -0/+11 |
| | | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId. | ||||
| * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -0/+268 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java