aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 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
|/
* 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
* 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
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-132-5/+6
|\
| * Removed unused Toast importDaniel Haß2014-05-111-1/+0
| * Toast replacementDaniel Haß2014-05-111-2/+4
| * Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
* | Add pgpauth app to help, update html-textviewDominik Schürmann2014-05-133-27/+4
|/
* Add Tim Bray to aboutDominik Schürmann2014-05-091-0/+1
* Version 2.7Dominik Schürmann2014-05-081-2/+2
* Translations from transifexDominik Schürmann2014-05-0819-3/+141
* Changelog 2.7Dominik Schürmann2014-05-081-0/+9
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-0812-28/+63
|\
| * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
* | Translations from transifexDominik Schürmann2014-05-084-8/+12
|/
* proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-086-148/+189
* use longsparsearrays instead of hashmaps in that one placeVincent Breitmoser2014-05-081-16/+19
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-083-5/+1
|\
| * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-083-5/+1