| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -2/+3 |
| | | |||||
| * | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 1 | -10/+14 |
| | | |||||
| * | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 1 | -3/+8 |
| | | |||||
| * | added proxy support to KeybaseLib | Adithya Abraham Philip | 2015-07-03 | 1 | -4/+2 |
| | | |||||
| * | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+6 |
| | | |||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -2/+2 |
| | | |||||
| * | Handle absence of personal information in Keybase search result | Tim Bray | 2014-09-21 | 1 | -1/+4 |
| | | |||||
| * | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -2/+2 |
| | | | | | created ui.util for everything related to formatting | ||||
| * | Fix construction of algorithmID in Keybase result lists | Tim Bray | 2014-09-15 | 1 | -2/+2 |
| | | |||||
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 1 | -1/+1 |
| | | |||||
| * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 1 | -0/+2 |
| | | | | | side is revoked/expired, the merge reflects that | ||||
| * | 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 |
 |
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/KeybaseKeyserver.java