aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-046-87/+61
| | | * | wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentSer...Vincent Breitmoser2014-05-0314-269/+209
| | | * | wrapped-key-ring: small fix to make it work againVincent Breitmoser2014-05-032-14/+12
| | | * | wrapped-key-ring: forgot to add UncachedKeyRing classVincent Breitmoser2014-05-031-0/+29
| | | * | wrapped-key-ring: move more helper methods into keysVincent Breitmoser2014-05-035-15/+153
| | | * | wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-037-125/+118
| | | * | certification is always done with the master keyVincent Breitmoser2014-05-032-56/+1
| | | * | wrapped-key-ring: first steps, get rid of key imports in decryptverify and si...Vincent Breitmoser2014-05-0312-320/+744
* | | | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
* | | | | First version of automatic contact discovery.mar-v-in2014-06-049-0/+358
* | | | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
* | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
* | | | | 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
* | | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
|/ / / / /
* | | | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
* | | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-272-0/+39
* | | | | ContactHelper can read email addresses from contact listmar-v-in2014-05-262-0/+22
| |/ / / |/| | |
* | | | Merge pull request #632 from timbray/masterDominik Schürmann2014-05-257-63/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
| * | | Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| * | | Add Log.d for QueryFailedExceptionTim Bray2014-05-237-40/+28
|/ / /
* | | Layout fixes for key importDominik Schürmann2014-05-199-66/+58
* | | Add license header to FixedDrawerLayoutDominik Schürmann2014-05-181-0/+16
* | | Merge branch 'thi-highlight-keyserver-search-results-as-well'Dominik Schürmann2014-05-189-91/+128
|\ \ \
| * | | Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
|/| | |
| * | | Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| * | | Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| * | | Add highlighting to keyserver/keybase searchThialfihar2014-05-165-5/+75
| * | | Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
* | | | Rename KeyServer to KeyserverDominik Schürmann2014-05-189-38/+34
|/ / /
* | | Merge pull request #630 from timbray/masterDominik Schürmann2014-05-162-24/+60
|\ \ \
| * | | 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
| * | | JWalk javadocsTim Bray2014-05-141-0/+48
|/ / /
* | | New screenshotsDominik Schürmann2014-05-1410-0/+0
* | | Merge pull request #627 from thi/improve-keybase.io-supportDominik Schürmann2014-05-146-49/+94
|\ \ \
| * | | Rename fingerPrint to fingerprintThialfihar2014-05-145-16/+16
| * | | 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-142-5/+8
| * | | Add extraData property in ImportKeyListEntryThialfihar2014-05-143-8/+20
| * | | 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
| | |/ | |/|
* / | Clarify help startDominik Schürmann2014-05-141-1/+1
|/ /
* | Update html-textviewDominik Schürmann2014-05-141-0/+0
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-132-5/+6
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 13:38:17 +0000