aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
Commit message (Expand)AuthorAgeFilesLines
* add ecc supportVincent Breitmoser2014-08-241-1/+1
* Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
* Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
* Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-101/+29
* Fix keybase importDominik Schürmann2014-06-201-1/+2
* New callback model for ImportKeysActivityDominik Schürmann2014-06-191-9/+10
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-1/+2
|\
| * fixed error messageTim Bray2014-06-041-1/+2
* | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
* | Store origin with ImportKeysListEntrymar-v-in2014-05-271-0/+1
|/
* Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-231-12/+12
* Add Log.d for QueryFailedExceptionTim Bray2014-05-231-2/+3
* Merge highlight keyserver pull requestDominik Schürmann2014-05-181-2/+3
* Rename KeyServer to KeyserverDominik Schürmann2014-05-181-0/+175