Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -1/+1 |
| | |||||
* | Handle empty keybase.io query, should fix #675 | Tim Bray | 2014-06-22 | 1 | -0/+3 |
| | |||||
* | Cleanup pull keybase code | Dominik Schürmann | 2014-06-21 | 1 | -6/+1 |
| | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -101/+29 |
| | |||||
* | Fix keybase import | Dominik Schürmann | 2014-06-20 | 1 | -1/+2 |
| | |||||
* | New callback model for ImportKeysActivity | Dominik Schürmann | 2014-06-19 | 1 | -9/+10 |
| | |||||
* | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -1/+2 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | fixed error message | Tim Bray | 2014-06-04 | 1 | -1/+2 |
| | | |||||
* | | Store nice origin with keybase keys (that can't be interpreted as HKP server) | mar-v-in | 2014-05-29 | 1 | -1/+2 |
| | | |||||
* | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 1 | -0/+1 |
|/ | |||||
* | Finished cleaning up rebase conflicts post Keyserver exception refactor | Tim Bray | 2014-05-23 | 1 | -12/+12 |
| | |||||
* | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -2/+3 |
| | |||||
* | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 1 | -2/+3 |
| | |||||
* | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -0/+175 |