aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-042-60/+61
|\
| * Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-023-31/+36
| |\
| * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-022-24/+51
| * | fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-271-2/+1
| * | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-37/+12
* | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
* | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
* | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
|\ \ \
| * | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| * | | Add hkps supportmar-v-in2014-05-271-9/+37
* | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
* | | | Make abstract methods in Keyserver public (implementations make them public a...mar-v-in2014-05-291-3/+3
|/ / /
* | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
* | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-271-0/+38
| |/ |/|
* | Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-233-23/+24
* | Add Log.d for QueryFailedExceptionTim Bray2014-05-233-12/+16
|/
* Merge highlight keyserver pull requestDominik Schürmann2014-05-183-2/+13
|\
| * Add highlighting to keyserver/keybase searchThialfihar2014-05-163-2/+13
* | Rename KeyServer to KeyserverDominik Schürmann2014-05-183-8/+5
|/
* keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
* keybase now has key info in search outputTim Bray2014-05-151-0/+5
* Rename fingerPrint to fingerprintThialfihar2014-05-142-9/+9
* Add github, twitter, website info for keybase keysThialfihar2014-05-141-0/+17
* Cleanup keybase query a bitThialfihar2014-05-141-15/+14
* Don't guess keybase key algorithm and sizeThialfihar2014-05-141-4/+2
* Add extraData property in ImportKeyListEntryThialfihar2014-05-142-6/+18
* List full keybase id or strong key id matches on topThialfihar2014-05-141-1/+10
* Make keybase lookup works for key ids starting with 0xThialfihar2014-05-141-1/+6
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-064-0/+835
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 12:51:38 +0000